diff --git a/IntelliJ/RailsCasts.icls b/IntelliJ/RailsCasts.icls
index dd907b7..e924a3c 100644
--- a/IntelliJ/RailsCasts.icls
+++ b/IntelliJ/RailsCasts.icls
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scheme name="RailsCasts" version="124" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
-  <option name="EDITOR_FONT_SIZE" value="12" />
+  <option name="EDITOR_FONT_SIZE" value="14" />
   <option name="CONSOLE_FONT_NAME" value="Menlo" />
+  <option name="CONSOLE_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Bitstream Vera Sans Mono" />
   <colors>
     <option name="ADDED_LINES_COLOR" value="d6822" />
@@ -33,16 +34,20 @@
     <option name="ABSTRACT_CLASS_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="ABSTRACT_METHOD_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="ANNOTATION_NAME_ATTRIBUTES">
       <value>
@@ -53,6 +58,7 @@
     <option name="ANONYMOUS_CLASS_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="BAD_CHARACTER">
@@ -115,54 +121,71 @@
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="3a2323" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CLASS_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
         <option name="BACKGROUND" value="1f1f1f" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ff6b68" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
         <option name="FOREGROUND" value="f7f7f7" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
         <option name="FOREGROUND" value="a6a6a6" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="CONSOLE_USER_INPUT">
+      <value>
+        <option name="FOREGROUND" value="7f00" />
+        <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CONSTRUCTOR_CALL_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CONSTRUCTOR_DECLARATION_ATTRIBUTES">
       <value>
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
         <option name="FOREGROUND" value="da4939" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.IMPORTANT">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.KEYWORD">
@@ -174,31 +197,37 @@
     <option name="CSS.NUMBER">
       <value>
         <option name="FOREGROUND" value="6897bb" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
         <option name="FOREGROUND" value="ffffff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CSS.URL">
       <value>
         <option name="FOREGROUND" value="287bde" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CTRL_CLICKABLE">
@@ -208,19 +237,29 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
+    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="8000" />
+        <option name="BACKGROUND" value="ffcccc" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ab51ba" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="f9795" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
@@ -229,19 +268,42 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
+    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="808080" />
+        <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="808080" />
+        <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="6897bb" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="a5c25c" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="4646f1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="Class">
+      <value>
+        <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Clojure Atom">
@@ -259,39 +321,58 @@
     <option name="Clojure Literal">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="DEFAULT_BRACES">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="DEFAULT_BRACKETS">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_CLASS_NAME">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_CLASS_REFERENCE">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_COMMA">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="DEFAULT_CONSTANT">
       <value>
         <option name="FOREGROUND" value="c8dd9e" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
         <option name="FOREGROUND" value="629755" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
@@ -304,31 +385,43 @@
     <option name="DEFAULT_DOC_MARKUP">
       <value>
         <option name="FOREGROUND" value="8eb485" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="DEFAULT_DOT">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_ENTITY">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
+        <option name="FOREGROUND" value="ffffff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_INSTANCE_FIELD">
       <value>
         <option name="FOREGROUND" value="79abff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_INTERFACE_NAME">
       <value>
         <option name="FOREGROUND" value="6898ba" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_INVALID_STRING_ESCAPE">
@@ -340,54 +433,77 @@
     <option name="DEFAULT_KEYWORD">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_METADATA">
       <value>
         <option name="FOREGROUND" value="924e27" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
         <option name="FOREGROUND" value="6897bb" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="DEFAULT_OPERATION_SIGN">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_PARAMETER">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="DEFAULT_PARENTHS">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_SEMICOLON">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="bed6ff" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
         <option name="FOREGROUND" value="a4c15b" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_TAG">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
       <value>
         <option name="BACKGROUND" value="33463a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DEFAULT_VALID_STRING_ESCAPE">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="DELETED_TEXT_ATTRIBUTES">
       <value>
@@ -407,29 +523,34 @@
       <value>
         <option name="BACKGROUND" value="3d0909" />
         <option name="ERROR_STRIPE_COLOR" value="eb5e42" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
         <option name="BACKGROUND" value="666666" />
         <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
         <option name="BACKGROUND" value="164716" />
         <option name="ERROR_STRIPE_COLOR" value="18701" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
         <option name="BACKGROUND" value="1e1e45" />
         <option name="ERROR_STRIPE_COLOR" value="3b59b2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
@@ -439,43 +560,62 @@
       </value>
     </option>
     <option name="DOC_COMMENT_TAG_VALUE">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
         <option name="BACKGROUND" value="5e5339" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="EL.BOUNDS">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="EL.KEYWORD">
       <value>
         <option name="FOREGROUND" value="8080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="EL.NUMBER">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="EL.STRING">
       <value>
         <option name="FOREGROUND" value="3adf3a" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="ENUM_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="7fb347" />
+        <option name="EFFECT_TYPE" value="0" />
+      </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="BACKGROUND" value="2d6099" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="575c5d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -488,44 +628,58 @@
     <option name="First symbol in list">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
         <option name="EFFECT_COLOR" value="f49810" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="GROOVY_KEYWORD">
+      <value>
+        <option name="FOREGROUND" value="cc7832" />
+        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
         <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HTML_TAG">
       <value>
         <option name="FOREGROUND" value="e6e1dc" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
@@ -539,32 +693,46 @@
       <value>
         <option name="FOREGROUND" value="ffc66d" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Head symbol from clojure.core">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="424445" />
         <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="INFO_ATTRIBUTES">
+      <value>
+        <option name="EFFECT_COLOR" value="cccccc" />
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
     </option>
     <option name="INHERITED_METHOD_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
         <option name="BACKGROUND" value="33463a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
@@ -576,16 +744,25 @@
     <option name="INTERFACE_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="6898ba" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="Instance property reference ID">
+      <value>
+        <option name="FOREGROUND" value="79abff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
         <option name="FOREGROUND" value="629755" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
         <option name="FOREGROUND" value="8eb485" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
@@ -606,36 +783,43 @@
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="BACKGROUND" value="1f1f1f" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
         <option name="FOREGROUND" value="6897bb" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
         <option name="FOREGROUND" value="a4c15b" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="a4c15b" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.BLOCK_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.DOC_COMMENT">
       <value>
         <option name="FOREGROUND" value="629755" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.DOC_TAG">
@@ -649,15 +833,18 @@
       <value>
         <option name="FOREGROUND" value="ffc66d" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
         <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
+        <option name="FOREGROUND" value="ffffff" />
         <option name="FONT_TYPE" value="1" />
         <option name="EFFECT_TYPE" value="-1" />
       </value>
@@ -665,6 +852,7 @@
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
         <option name="FOREGROUND" value="79abff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
@@ -677,11 +865,13 @@
     <option name="JS.KEYWORD">
       <value>
         <option name="FOREGROUND" value="cc7833" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
@@ -692,6 +882,7 @@
     <option name="JS.NUMBER">
       <value>
         <option name="FOREGROUND" value="6898ba" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.PARAMETER">
@@ -709,61 +900,137 @@
       <value>
         <option name="FOREGROUND" value="bed6ff" />
         <option name="FONT_TYPE" value="3" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
         <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.STRING">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="a4c15b" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JSP_ATTRIBUTE_NAME">
       <value>
         <option name="FOREGROUND" value="8080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JSP_ATTRIBUTE_VALUE">
       <value>
         <option name="FOREGROUND" value="3adf3a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JSP_DIRECTIVE_BACKGROUND">
       <value>
         <option name="BACKGROUND" value="141414" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JSP_DIRECTIVE_NAME">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="JSP_SCRIPTING_BACKGROUND">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LINE_FULL_COVERAGE">
+      <value>
+        <option name="FOREGROUND" value="ccffcc" />
+        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LINE_NONE_COVERAGE">
+      <value>
+        <option name="FOREGROUND" value="ffcccc" />
+        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LINE_PARTIAL_COVERAGE">
+      <value>
+        <option name="FOREGROUND" value="ffffcc" />
+        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LIVE_TEMPLATE_ATTRIBUTES">
+      <value>
+        <option name="EFFECT_COLOR" value="ff0000" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LOCAL_VARIABLE_ATTRIBUTES">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LOG_ERROR_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="ff0000" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LOG_EXPIRED_ENTRY">
+      <value>
+        <option name="FOREGROUND" value="555555" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="LOG_WARNING_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="ffa500" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="List/map to object conversion">
+      <value>
+        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="5" />
+      </value>
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ffffff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="METHOD_CALL_ATTRIBUTES">
       <value>
+        <option name="FOREGROUND" value="ffffff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="METHOD_DECLARATION_ATTRIBUTES">
       <value>
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="Map key">
+      <value>
+        <option name="FOREGROUND" value="bed6ff" />
+        <option name="EFFECT_TYPE" value="5" />
       </value>
     </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
@@ -776,18 +1043,21 @@
     <option name="PARAMETER_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_CONSTANT">
       <value>
         <option name="FOREGROUND" value="9876aa" />
         <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_DOC_COMMENT_ID">
       <value>
         <option name="FOREGROUND" value="629755" />
         <option name="BACKGROUND" value="3d403d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_DOC_TAG">
@@ -801,6 +1071,7 @@
       <value>
         <option name="FOREGROUND" value="a5c25c" />
         <option name="BACKGROUND" value="5e6465" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_IDENTIFIER">
@@ -813,11 +1084,13 @@
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_NUMBER">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_PREDEFINED SYMBOL">
@@ -828,17 +1101,21 @@
       </value>
     </option>
     <option name="PHP_SCRIPTING_BACKGROUND">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="PHP_TAG">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PHP_VAR">
       <value>
         <option name="FOREGROUND" value="bf5553" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PROPERTIES.INVALID_STRING_ESCAPE">
@@ -855,46 +1132,71 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
+    <option name="PROPERTIES.KEY_VALUE_SEPARATOR">
+      <value>
+        <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
     <option name="PROPERTIES.VALID_STRING_ESCAPE">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="PROPERTIES.VALUE">
       <value>
         <option name="FOREGROUND" value="a5c25c" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="PY.STRING.B">
       <value>
         <option name="FOREGROUND" value="a5c261" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="REASSIGNED_PARAMETER_ATTRIBUTES">
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.BRACES">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.BRACKETS">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
@@ -909,17 +1211,20 @@
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.PARENTHS">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
@@ -933,97 +1238,124 @@
     <option name="Rainbow Parens Level 1 (outermost)">
       <value>
         <option name="FOREGROUND" value="cc7a7a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 2">
       <value>
         <option name="FOREGROUND" value="ccb07a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 3">
       <value>
         <option name="FOREGROUND" value="7acc7a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 4">
       <value>
         <option name="FOREGROUND" value="7accb0" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 5">
       <value>
         <option name="FOREGROUND" value="7ab0cc" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 6">
       <value>
         <option name="FOREGROUND" value="7a7acc" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 7">
       <value>
         <option name="FOREGROUND" value="b07acc" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 8">
       <value>
         <option name="FOREGROUND" value="cc7ab0" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="Rainbow Parens Level 9">
       <value>
         <option name="FOREGROUND" value="ac7a7a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="SCOPE_KEY_All">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="SCOPE_KEY_Non-Project Files">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="SCOPE_KEY_Problems">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="SCOPE_KEY_Production">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="SCOPE_KEY_Project Files">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="SCOPE_KEY_Tests">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="6300" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="SQL_COLUMN">
       <value>
         <option name="FOREGROUND" value="d0d0ff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="SQL_KEYWORD">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="SQL_STRING">
       <value>
         <option name="FOREGROUND" value="a5c261" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="SQL_TABLE">
       <value>
         <option name="FOREGROUND" value="da4939" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
@@ -1036,16 +1368,26 @@
       <value>
         <option name="FOREGROUND" value="c8dd9e" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="Static property reference ID">
+      <value>
+        <option name="FOREGROUND" value="c8dd9e" />
+        <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="TEMPLATE_VARIABLE_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ae8abe" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="e6e1dc" />
+        <option name="FOREGROUND" value="e1dbd5" />
         <option name="BACKGROUND" value="1f1f1f" />
         <option name="EFFECT_TYPE" value="5" />
       </value>
@@ -1054,17 +1396,20 @@
       <value>
         <option name="BACKGROUND" value="6300" />
         <option name="ERROR_STRIPE_COLOR" value="ff00" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="TYPE_PARAMETER_NAME_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="bfa4a4" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="TYPO">
@@ -1077,144 +1422,185 @@
       <value>
         <option name="FOREGROUND" value="ff0000" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="Unresolved reference access">
+      <value>
+        <option name="FOREGROUND" value="bbbbbb" />
+        <option name="BACKGROUND" value="2b2b2b" />
+        <option name="EFFECT_COLOR" value="808080" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="VELOCITY_DIRECTIVE">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="VELOCITY_KEYWORD">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="VELOCITY_REFERENCE">
       <value>
         <option name="FOREGROUND" value="d0d0ff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="VELOCITY_SCRIPTING_BACKGROUND">
       <value>
         <option name="BACKGROUND" value="303030" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="VELOCITY_STRING">
       <value>
         <option name="FOREGROUND" value="a5c25c" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="3b3b24" />
-        <option name="EFFECT_TYPE" value="2" />
         <option name="ERROR_STRIPE_COLOR" value="8c8c00" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="480c48" />
         <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5a647e" />
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
+    </option>
+    <option name="WRONG_REFERENCES_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="ff0000" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
         <option name="FOREGROUND" value="bed6ff" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
         <option name="FOREGROUND" value="808080" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
         <option name="FOREGROUND" value="cc7832" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_PROLOGUE">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_TAG">
       <value>
         <option name="FOREGROUND" value="e6e1dc" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XML_TAG_DATA">
-      <value />
+      <value>
+        <option name="EFFECT_TYPE" value="0" />
+      </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
         <option name="FOREGROUND" value="ffc66d" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XPATH.KEYWORD">
       <value>
         <option name="FOREGROUND" value="cc7832" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XPATH.STRING">
       <value>
         <option name="FOREGROUND" value="a5c25c" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XPATH.XPATH_NAME">
       <value>
         <option name="FOREGROUND" value="da4939" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="XPATH.XPATH_VARIABLE">
       <value>
         <option name="FOREGROUND" value="d0d0ff" />
         <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
         <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
         <option name="FOREGROUND" value="e8bf6a" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
         <option name="FOREGROUND" value="a5c261" />
+        <option name="EFFECT_TYPE" value="0" />
       </value>
     </option>
     <option name="YAML_SIGN">