From 260f0f9c48be66d31382065fb678273bf4469738 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 16 Feb 2012 19:41:59 +0100
Subject: [PATCH 01/26] optimized file manager for javac 1.7

---
 .../jetbrains/jps/javac/JavacFileManager.java |   9 ++
 .../jps/javac/OptimizedFileManager17.java     | 149 ++++++++++++++++++
 .../jps/server/ClasspathBootstrap.java        |  24 ++-
 jps/lib/optimizedFileManager.jar              | Bin 4525 -> 7940 bytes
 4 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java

diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
index 73e238f9bdd7..19c920988311 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
@@ -37,6 +37,15 @@ class JavacFileManager extends ForwardingJavaFileManager<StandardJavaFileManager
     myContext = context;
   }
 
+  @Override
+  public Iterable<JavaFileObject> list(Location location,
+                                       String packageName,
+                                       Set<JavaFileObject.Kind> kinds,
+                                       boolean recurse) throws IOException {
+    final Iterable<JavaFileObject> result = super.list(location, packageName, kinds, recurse);
+    return result;
+  }
+
   public boolean setOutputDirectories(final Map<File, Set<File>> outputDirToSrcRoots) {
     for (File outputDir : outputDirToSrcRoots.keySet()) {
       // this will validate output dirs
diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java b/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
new file mode 100644
index 000000000000..7e1eb9f5958b
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
@@ -0,0 +1,149 @@
+package org.jetbrains.jps.javac;
+
+import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.ListBuffer;
+
+import javax.lang.model.SourceVersion;
+import javax.tools.*;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * WARNING: Loaded via reflection, do not delete
+ *
+ * @noinspection UnusedDeclaration
+ */
+class OptimizedFileManager17 extends com.sun.tools.javac.file.JavacFileManager {
+  private boolean myUseZipFileIndex;
+  private final Map<File, Archive> myArchives;
+  private final Map<File, Boolean> myIsFile = new ConcurrentHashMap<File, Boolean>();
+
+  public OptimizedFileManager17() throws Throwable {
+    super(new Context(), true, null);
+    final Field archivesField = com.sun.tools.javac.file.JavacFileManager.class.getDeclaredField("archives");
+    archivesField.setAccessible(true);
+    myArchives = (Map<File, Archive>) archivesField.get(this);
+  }
+
+  @Override
+  public Iterable<JavaFileObject> list(Location location, String packageName, Set<JavaFileObject.Kind> kinds, boolean recurse) throws IOException {
+    Iterable<? extends File> path = getLocation(location);
+    if (path == null) {
+      return List.nil();
+    }
+
+    RelativePath.RelativeDirectory subdirectory = new RelativePath.RelativeDirectory(packageName.replace('.', '/'));
+    
+    ListBuffer<JavaFileObject> results = new ListBuffer<JavaFileObject>();
+
+    for (File file : path) {
+      Archive archive = myArchives.get(file);
+      
+      final boolean isFile;
+      if (archive != null) {
+        isFile = true;
+      }
+      else {
+        isFile = isFile(file);
+      }
+      
+      if (isFile) {
+        // Not a directory; either a file or non-existant, create the archive
+        try {
+          if (archive == null) {
+            archive = openArchive(file);
+          }
+          listArchive(archive, subdirectory, kinds, recurse, results);
+        } 
+        catch (IOException ex) {
+          log.error("error.reading.file", file, getMessage(ex));
+        }
+      }
+      else {
+        listDirectory(file, subdirectory, kinds, recurse, results);
+      }
+      
+    }
+    return results.toList();
+  }
+
+  private static void listArchive(Archive archive, RelativePath.RelativeDirectory subdirectory, Set<JavaFileObject.Kind> fileKinds, boolean recurse, ListBuffer<JavaFileObject> resultList) {
+    // Get the files directly in the subdir
+    List<String> files = archive.getFiles(subdirectory);
+    if (files != null) {
+      for (; !files.isEmpty(); files = files.tail) {
+        String file = files.head;
+        if (isValidFile(file, fileKinds)) {
+          resultList.append(archive.getFileObject(subdirectory, file));
+        }
+      }
+    }
+    if (recurse) {
+      for (RelativePath.RelativeDirectory s: archive.getSubdirectories()) {
+        if (contains(subdirectory, s)) {
+          // Because the archive map is a flat list of directories,
+          // the enclosing loop will pick up all child subdirectories.
+          // Therefore, there is no need to recurse deeper.
+          listArchive(archive, s, fileKinds, false, resultList);
+        }
+      }
+    }
+  }
+  
+  private void listDirectory(File directory, RelativePath.RelativeDirectory subdirectory, Set<JavaFileObject.Kind> fileKinds, boolean recurse, ListBuffer<JavaFileObject> resultList) {
+    File d = subdirectory.getFile(directory);
+
+    File[] files = d.listFiles();
+    if (files == null) {
+      return;
+    }
+
+    if (sortFiles != null) {
+      Arrays.sort(files, sortFiles);
+    }
+
+    for (File f: files) {
+      String fileName = f.getName();
+      if (f.isDirectory()) {
+        if (recurse && SourceVersion.isIdentifier(fileName)) {
+          listDirectory(directory, new RelativePath.RelativeDirectory(subdirectory, fileName), fileKinds, recurse, resultList);
+        }
+      } 
+      else {
+        if (isValidFile(fileName, fileKinds)) {
+          //JavaFileObject fe = new RegularFileObject(this, fname, new File(d, fname));
+          JavaFileObject fe = getRegularFile(f);
+          resultList.append(fe);
+        }
+      }
+    }
+  }
+  
+  private boolean isFile(File root) {
+    Boolean cachedIsFile = myIsFile.get(root);
+    if (cachedIsFile == null) {
+      cachedIsFile = root.isFile();
+      myIsFile.put(root, cachedIsFile);
+    }
+    return cachedIsFile.booleanValue();
+  }
+
+  private static boolean contains(RelativePath.RelativeDirectory subdirectory, RelativePath.RelativeDirectory other) {
+    final String subdirPath = subdirectory.getPath();
+    final String otherPath = other.getPath();
+    return otherPath.length() > subdirPath.length() && otherPath.startsWith(subdirPath);
+  }
+
+  private static boolean isValidFile(String name, Set<JavaFileObject.Kind> fileKinds) {
+    JavaFileObject.Kind kind = getKind(name);
+    return fileKinds.contains(kind);
+  }
+
+}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
index 3d99d2fb30c2..65ba0c22b12d 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
@@ -64,6 +64,24 @@ public class ClasspathBootstrap {
     }
   }
 
+  private static class OptimizedFileManager17ClassHolder {
+    static final String CLASS_NAME = "org.jetbrains.jps.javac.OptimizedFileManager17";
+    static final Class<StandardJavaFileManager> managerClass;
+    static {
+      Class<StandardJavaFileManager> aClass = null;
+      try {
+        aClass = (Class<StandardJavaFileManager>)Class.forName(CLASS_NAME);
+      }
+      catch (Throwable e) {
+        aClass = null;
+      }
+      managerClass = aClass;
+    }
+
+    private OptimizedFileManager17ClassHolder() {
+    }
+  }
+
   private ClasspathBootstrap() {
   }
 
@@ -150,7 +168,11 @@ public class ClasspathBootstrap {
 
   @Nullable
   public static Class<StandardJavaFileManager> getOptimizedFileManagerClass() {
-    return OptimizedFileManagerClassHolder.managerClass;
+    final Class<StandardJavaFileManager> aClass = OptimizedFileManagerClassHolder.managerClass;
+    if (aClass != null) {
+      return aClass;
+    }
+    return OptimizedFileManager17ClassHolder.managerClass;
   }
 
   public static File getResourcePath(Class aClass) {
diff --git a/jps/lib/optimizedFileManager.jar b/jps/lib/optimizedFileManager.jar
index 52b7a691c645f3835e039c464001d39a9d2949c4..dbdeba34d491a4484d55c326d31624886b734f1f 100644
GIT binary patch
literal 7940
zcmb7pWmFv7x-G%o-GVy=_XzINXyeehyGw$*OK^8@yz$VuCb$Q8Cs>f&?7Po-`;K?_
zK4aXkM%A~f#+-Als`YEuR8@e3$A|f&K4hzY`0v5LF7Us*ql@Jm)qg}_{tIDa?gnx(
zv379%4_Ms)g|%_|pLq5EZ+7Cp#oL&8n3(>*S&(7Si}^kreQuc<{k;@#8W<Sv|G-jl
za<jI#_Axh;wze}@GI21mG<V@JwKH*b9ndxZAfbu>a(2W{8N_sS@__=bKQ1sb6qh9`
z=z$o^OPF7OacwPhZIRu>^LMp^{O-DkU@|x#ht3?beW!%JNBW*^d@*w9B<P){DcOvp
zf<HqShZ>NcVfF=!z%9buS+y<1KL)kE#)7}3qD-2Al2Rr{$N#)c4;u<*8o+aTDh?|P
zdI}JZu)MH?x!!_MY4u%`8X|*~S4sM!y_iEjUq;y(&Rystw~L;-Lyj?)I++DJ33ldN
zcP}U)=LSN4DlXne(;umb-pyVlnmvGD=ULtJMzHu1_V3?|yF5?F*X;-y+1@imlsK2!
zb*D~vx}4upkH^0jzsGrFeJ_U_H@aszvPZP^G%8KS6ylU<*k-<6K-V{x(?^7#d4aSD
zzr)GoOWpI;JB%rDf-R{#Wk0$hAw9LsxmKUQ(Hi6tsDtFOPG{<&6Kt!8(#X7IdPYap
zKI~|`KR0t3V2i{<tGe7-0}cj!9@C9%Cp4`$r26V`Lmz9$VUKFXPwnfY&TU;vh9}KH
z+iEZBtrz^ZNzFY;+uv1`PxbQ%{c%Hu28}x7!WRE&rbS(%f*HMLbRzH1akmm^VF1C^
zE!N3u$|em7$6IzJ-xSUye|Ou2aBI4`0Hfg4riLoyHd;*z*xW&lcxLyeBnw-I{1rt<
zJGU|DSeCjo?KhKRb|DW2%PA#kTl+D^AIKq$7xGzMC_K3}>IyrIZ8f02pSmIg6JM%R
z<y|I{Pg^5qaVIL=jMiE#T14!DazR{zh_YnNNYw`8xhPgnMv<GuLz_m^xqMqIII#2#
z>{XGdKi{9G@27q1CpSy4=hjggmm)6laS=1FiokVb9Kt^azsGsv>Wlo;VmYJLP!|CE
za%$1iU1b9+r#`Q!U`@A^W?KItK9zyL;>RRxqhbpo#R#!$@$O5Kt7?ZEODchrPHNL^
zn_Uaj4oeqfqP8!1tBDX916N<Ug%oc3O=<53+;b1D21_=LL7YTgz^1-1G&Wa^cI6zI
zpMdtQJ;SgQk}I5Ag+0m92rbdGDQBkjIG;;b*C^v&`bnJ#R%RSe$cT@B)PDb1n;Qng
zE34!6G=|C)5sgkZ-4E+wM{<MeZm|QyLKF(Qg^`d9gp5KyE-W7IWN<IZuLMuRB6~5U
zTrmrVZ^LH1mF-rOZ8+xwzJuIzb_hv0j;ucFqNxdopi?&+sytb&_$N3>gZH2n`=Id+
zw@mv^vufh!iVAxWCLRf5+i4B@MU0SDIdD6N>EhsHfh-`5U3%dVqb4EUKL|2UK4osJ
zGJowzwWe@AC6YsqzE?adVOU7(+A}0u#+u>HpT`z7eq)h@Rv2k<xI6pPBkHQk-<qdl
z(=QN?QQ_sixJVXUjj0Dj+4?TxiS?bjQOs9)HmrhVtGneZHqKLN>s<5FGOKi&%u(O!
zONU2K4fesXfqXy+iiB1vR2KNwW3nn{oGx=T<&4tX(ziujU{;(5wJP#KW4C=Wri`el
z4L^TYUagC-x;Sxtse4Q0Wjys7DMEvQ1uy8dLSNWn`91`Vz*Aw^02b|~K#Wv<q#B~G
zHMF-F6q}wGI^MQ?sgX2?7%ZaD2R>_;F3oE$h*P#>Q+;O4j#&a#PtW$lwgXk!`bX7>
z(4wW>0L+BuyF!zCV5`q;@~%A})yIW*f6femK+Y6oAlk5(*`xGh96(8AIY*^bEQiei
zZhJYN0xFwYNL@qR*8w$<bsA1PFwC#N0VHHNil<INd!s_dMd%>hGQ=gU+#A^rG_0m#
zuP=<_aVq7|!sV)!x40=3BVvu#bOTocl_~`Soa3rm+kwFgJsHYn(+b5(Md6eUAvw0A
zgPZj^azwEpC8g?;=;i@oVdVh_#bft&p!VLa(8qI2+nx096HOfRc*n<uI@J~1YWk(o
zgx^LtMqa<~79+ARlp`XGz;FjAS}hC=uF~@3MB5fh5M@P8xamjZ7`R1ocpvPwFN)iZ
zq?AP06u0O_+q;=WI2iOhmwe*Yi05?w#_HwLQ||_@SyaVa895Bero=9P;K9n}q9}V;
z#{iied_J6w^BBo8yJcnw%9yeo#^L=o8<mi(PDzyF(rx|LRjs-yi@c7|I+uCeyQ5M`
z&PS#5`-VtRp#8_H7(HQ*Y#+~=c7F>GC7xW)X^Z$^fPJ8b4&Ov{b4XboWqejfOi9X(
zWINp(&pdn|aAY{au=@kI)OibBj)3^2M%^jLI<}}O`BNCp^~q~dR@T8wJB{XGItKVx
zuEv}ljj`U|{p+HKQ5+-M6}SrRc11o;7z{Cj^f|QCi$G4_NA{uFq|(ZZN3~-C?i$`~
zwwc+5lf<BddtmmB`6B@b`j%9HQJ4}R5J|vXy+sR6s?wrbqKSg;!oEvwv9=QS9P5g5
z{IZ?^4cH`07Ooa-!Trll=lJeCzei(AwOX=L#rVaVS5eM&eD7XO{P(W-u*N%I<l1z2
zmx;ve=8QsN6JZM)9`Gkpxt<ut4wcxgp;53M#jTGqVq5Bx@XGS5(=!dszEJ{<&304n
z@y|}643dY9>dY$<3C?7`X&o7=Jc$3KY(fL5(mvJf)e9!wH&5lPE03?kn)Bk7rCAqW
zGmHkR{8wQ<3etLNesfDdj6t<t8|A&J->dgw&uH7v7&b!G6QSoxc79A0MT6Lx-R`DW
zpO8WJ?kIVm6|73cmkHFz<ReB_UKwY=&NI_=SC8v*PjOB^DoGgPhtd@Ho0zH~R|7t2
zzdGaTglP;*&9_d!Y^?0HIevy?v`bRC()X0cpjVpFXmuU8|L!p+^^(ndl$7Gsa8<0q
z{XF?RG>e~u%R7=Xs{u^%E`?y%Q+?!IxR-$y&~I=utJ5dUelq>SaMDpvGL(ZiXmHUu
zC7$ujE_BWOD`{iT)A9#H#N_eDRmAbeUN1E8PWRp-SnKSySUzN#C&;)-SUBkG>DM}`
zNd1gZR(3v{l0ide3bCc;bocaYfPjd0(%Q6Dk=3qQ6G3m{q(?xCG39tDLOpgWFy?f+
zT=Fg9fDL&w^(X~SrJ58$C77?51Z%-^h@W#~D~f0>q7jK@5ia>Vnu*j87tQ?mqNR<W
zso`zBKWyu%c<qh{JoGOTsJ=|WAa15HMchT2plEZ%X~i42qzjyMVJ+XJKSyOY(ASC&
zAn!#yIP_(QnAN5e-mb&Ed?LOMe-<!y2&A@q<9m&~8s}{qc)-Vmg5=Qa#}T(5j{yDR
zi*v#DnpB#J6jMJOAq`72Buw>-m>}`(oR(MLvOCa;II-Rl9u31}K8w?lk;s3+WYfe8
z8kkOrag4b}1MQ(CotIYi4%Lv{grLeV%>zQ|0bwPPN8FMwLcAdF!X}zay+}6<NehC?
z9u|)wQo+P3OH=mjaCiI`8Dl~_WzH5xW9sZ-6;hJrik!4zns6#l0l})+RWO`3T={_V
zV&dzbkja+7qth4zDh)^NlTtP}F38!JYja1H+^vG9ebAc|j5oV)Q6Cc~Wh$`xyBFha
zACq0grdLF;KvSjf(|_>KQD+yVGD{fao0DQbBV5}EDnd6&<L*fmYy{PyfT9h@CxR;1
zi?=^sZ;r0?j7EkRJ#1cw^8A3KJke6DvX(SzHib^7Wj=B;QkZ@_1_PsYD<H3;JHXZ$
z{?E8cD*<njI_(x1lO}%L5RS)c`CK8Qen&Vpy(ZRVg-5X7hk^w$IVz&jCje}vn_h7b
z*$oo21a#bDwcTP|G}B_V>`)+8DIm$pyZMfA)~&s2Mda-?yUmJBeSfNchC6a#m8#4y
zW+U#>IhG+^waGm6t`@uK2H~G>wl%8_vm@!(3~Wl@4a3aFMk~x^>h*1#O8HL`mD~J6
zJ(0UKyb%J)>bK~o9LIcL<iQ^Vd*MJ5Kr#0tl|kIiPf+R;CuAgsdgJQZggy)Ir{fZC
zO|NnrluGi2b>zmzwe%v)Nyo|5iG!0IMRbGWC0s7G8s$$51N`FwYuT~1a!j7$?>#KX
z^CIn?3G4%Swx8u{JL8(Thp5)tQV@kBS*(h6Nf>8d!MRn&bxQOk3e1zWfX!48f)#F4
z#@fwQAT2VtDYm|v=lJd5_$!RDvWo4mu8Sh6629b>60-D4JxoFDq{>+`Mmfr&QIN$+
zktpwju_9o2@N1mnM`2}O;rD(<D=*X@bP5@OWVcvE5l`=0bYIi%`t$i+zPqaz)Q_Pa
z{QT&TEKdqUu+#9YLqS)zsnp{<-?7tBk?MvjCCa0;7RHHghv|YJ3O9`>+=2GUjZ*Z7
zM__CW0@5#}S!er1&>lk%^LM}4>eMXbqE0>lJ&V~ojJc!(*a?i{Mr)P5bdeWIW0q@B
z6kabNIVEuSa}=*<I^~5nLR!;4<v<O@*ai*uE6LTRDW;$gqFu0AIFo3|d;0w*GPh4^
z$DJ8TES4y99SNca4P}a3X>ZMOv8E1(q(rAgEO5hLs5*W>1Tg5ptOE{6IbIN`Tg0DY
z%r&)yPLM)+_FuJdacqXaXAm588k-$_;4_c2auZwLHmoMTjWeD|2AeJVV$3If*^1`A
zVf7n><{o9%pCeYEhJ|P+RpVV_{`z?!*pJ4liA7Hy&Sg%n430OJ7s3UUPNoVv^gE+Y
zx)(SH;OKMARHV>gO=ga|h8~@6)9vyRC^{^;_M%(_b-`*2Z?IX_$vItVgzr?;(xir1
zYqiO6MTb?%;AqB?I(>qKy?&A1!YB2-L?$6ko!dQ*%ePKF@T=u1(8Pioz5R|nPxj>}
zmx|J&D_kauwc(`>{x)94yj&+^SW42^^8SuymBu?-vng=LV6_hg$Huxh)5OiVE@erA
zgZk3EhXd9^-E1$ERLp=<09A)^^#`kfVz#SuoWBe>%X^%?ZLXUKpDa%_3egeAs)k(;
z1Ya}e%OYCKqpEgXYwSMDkFHYVhCqnt;vL6&)hZ2<N3bmC)re}eI%-T!t6B`-Yp$O7
zUfIlhz9c_3kh14+mSuE!ym^+uTW6Yy+ZHegi?3fj7^dg2UEDd%zk9d3D)=7j@B$$L
z-<4+I9Pa)XHc~C&3&y{_Ix@^`mg<KL$s{vk3>cWVR4_2S|3_!cCGanAtb?Rarb+zk
zJ$IZwW^u61QKh_XpH-8MX0J`OCcvuMs#&mZ^V3Yi2L0@O*WG%X=bE1Gs_*&lp>N$U
zUm|IRkl`snrswyryDrC%-yaRHF3ttMV;Uz}eRYb(477E(YEy>Z2zR#ee~NVu4kNpE
zPLAVXn+6lFxwPp(*<CKRa-jCY4nq{AXVW-e)`X*+;=_F1WBQuKR>L2Iy<o6LH>okO
zkW7Zx;)i47M>n~IL~A!u<jzO@L`ycUg>GWvEHAS|az7XUw$p5eDcOdoPF^}tR+m#v
zq329VF9YQsYNPMyTkNZEw7;kIbrzWlb+T6Ulx_R_Q5n5YfyxNK8)U@YRgZki2%Fmd
zK_tv_S(0+iisH|X)16r9&l-MCcXXEo#Uc&BC;rxAoRu<X)#?Zus#%sy<}>=hi+W&>
zRw@kE^36@f1(rH!yXKOd%C1~mbuAgvV_Vhh;aapq!SK99i3xx#S)j7gs$$7bi;jXr
zm50%(nZ{LRWi<UtVMUxIZ;s-iIsif#&F@Oz4uPjv?#kfQV=JSB=G&kO?YFX*D>)~g
zFkr}k_m9qsOgrFpsUHtnKCf%R^YDrK#7LgOzELB`ucIa*Vlr`Hm1QfWm*q--ndm-}
zPLgLY+~PN-=rdEpPoP)Cao8m3**xt^F{7+{drSFX*;01O@2gT(k#}!ftI&c_S_LQ7
zx}^kL5U?er<+>VGQe+d^_VdRBS9C~HWJ*}xFrP!&G-*J=l^PR-s$LxkNI%b1S*q?C
z@xgw~Dxf}Hj7+Nx(6X(c){IRIU~0A=ORSWaSR&!sA4z9A<8wG2H@u7}$#^?yWJ`=$
z;xG{<vzgRQtKK1L?3PzvYj#*nD?znx8;SxU5u;jk81&fQL2pzN_WYz7v9&Ux%zGp0
zn-^G|6i0CEq{a=iJmF?5T_4E6qekJHWk;hvi7;NHqm})%uS0e>QS)m->*&jR5}Q1t
zo%?{Sd;bi+vmZZ8ZNGa=sx`&LL|W5qI(@L0SO?iKX+RN+p6Z$+?v1rx&Rjmv{+T?p
z{0?TS<aXnMkwHrc7J;D>hYRMQ8i3hKcE)@BBIcr}QL9nh_C6RPqd9#*dt>z@(`y&5
z5A!J`YO(o>+v~dC059SP?vo82;eFRjh1BZ!pl^f;<SkCg5}u~2ATHA#SVnEiY;t!a
zTc?<#K*J2Rl0=d9$JY}n>P$PJkuMSwOOOwUGCjgzBf*84E60kItWNpDP7CQn)L>Z-
zRxbMC6pe4=Ng!cm6tsg|g;5R_PS!67fHC7EZ7QkcF!e<gl+}mx@<$^dr+zgSNz#he
zWJPY3m~;}`=1iZTX#gEvJbp)BOSTNzu{iO3T2VhdbkCxc#m|bZx|r9iZ%64E{23T|
zoW3eg@Nau0SINtHmHQkmQx|~xJF<jbv`D5|VY4vh1c|=Oulq<eKqGZ(JI5>?zcR?H
z!EV2B<Jue$+XgK6D%y>RA-7QaPk*&P!6Ii(WB_5cWn|dwW|-$wW}!&B)Pm51a}5D_
z-eDKWbqs!C7ibgM4>Y~H--dL!7V)!4#EHaW6B*C}`H|v*?%^Z|VL)koIRY8v>NE+9
z3qk&VS+1xuFtv0vNFoMjOf4Z--|4j5V)Ez?-x*G1(@uhoQ5+F-ka|3m4WpcTFlu*c
zQYS9ijX^kVsb4VTpe04h|8g5Klv)d$)doZ_QO!0;B1kwy0wMqyM`#Y%{QePE7*B-f
zBXEn58yMO)i(M66Pfb%ei)}7AjlEkaj)#Y#{|OBPhrpH?q{KCXZ5ug~30%NFj=aGD
zFjt}j*rWKsfz+iD7$pV*-2EC{u{WR(IQgS$5u{)+b!oH`I=I4bO>w%MAd3uy2C$6q
z;R+TVPz;Rxc#bQMcI&*_J|}lp(9R5|ZxsAIDTk+bS^S!2{~$Ur2Zs^q_7avAlhgo~
zEc7^RSjIb>c@!l~s(Q{WdJ^3&uae=-3}Z}t>NJF1%g2<JP=KO}*_EJbSj~neSbr+*
zIhvk<;Xyfepju<pqb_<=nmIIFROijl#*u9D#6b1xddc&Sea-#Fg_i;L$>jR&>bA|{
z1oq|oY}By!(59gY;yE(B+KNcC4mkp>rg9gV?i}atRkD!)$c*m9EPA_^;n%eyiLMw-
z%T~>XHTfU6vwRA#zd#QtMg(&0aDdj>!Sp3b!fP5T+O7g)zJkZkf>rKX#4(&I#+u{s
zeL691&oE?69Y1H}1kA6PXBZq*)&-vsK?lHZC$m3VZhyeGm(6jT&s(}Gi%FC6i5;G7
zMyJr{BAzQgTZqsGC)MP!pSoB-n5|^;o8QLdQ)2iF`08bPN(yps*aijBGgy_xyr7qs
zz_}hG3Q?_m>?4_8!2+t#Q+OKSHQq1xE};Ju{zyCQ+nQ(w$ZJxk7}EcsX6RC|y1U8d
zTx#JH<*3(jxMyqDQdR1UL`*S>dr@hA;@PMp_b?%4z5UtovV0|fq9r?}(km>d(jEk7
zF0j%-rrVtdr|Ili?{Qv_%hd|ay^J5kZ)Ps$Z>&zk%*C!fAN~AeO*OD=f@hmze%wN5
zi<A~l#9zmFS;T7hrUBj}jxmI5p@dJb!G&UD-s1ha4m-TrX?3cS-?H0ug}uG9`J2($
zGl#naL&m4O>FP4=H<aa(g`H2+dY=zmhF<tg0*p9g(gy_tnrkliVX&?^DYCFhnSD(I
zqE!_HvE2RY&hOp@FN%Bo2x;9KH+-6)il1thcMME#MD{iWBU5&JJ#2NLya2vR?|D+I
zYVVx}8R}{+hi>F>I*5O9kJ@01Gu_;8qd`Sx4^OQ})f$A4;*V5?(;jSNtLJOkbR~%5
zC0kL8IlbT8b;W!iyO=0%CzZsStous)jD!7H+@$2qjxWqIh|Tqsoheh@kQdCf9Euao
z*)aVPO&T!zEme1TAr=%k`lK2lFo^87^#O%_Oo2bG3O!{#B1ko#tU$CozGhb9=QFYw
zBN7n}kQ9}z?<zTX;ES>%${|*H21hkjqWDV`$T6Z?TR+08M2v+so_xOpqiXyz1Qx@!
zliHL^%l@Fx1`W_}K=MP1N#}kjm%0XRyRO8rV_TM7BFn3!q}-Eh=+dnZ{sjmY{#eRX
z@^(~6xj48mT_WpLQi0EedkdJ?QN@KtW^809E6i8SOE6?Y%0cT#zqU4E&<b)j-!%mw
zC-bjHUW<WZ2PPLo_4k~3xrl_B=R2xa=i-PV@WaQ*Kr89)rnX~hgywt#aWQ@msoWqB
zT7>wZW!V7*b_X$7x%+bHL-9ecijuMns&%b9wk!GNTFx~J<Q^^J9CSL8(bZ-c*jvXm
zU4M5D)P%kxy`8K7?g*5CzK~+x6J!!|Nk9WxpOLpMcW%Na<TKLWA-8vOKycVI<qTOG
zKU(VuFzkpSetiZC>>T$USyGW+twmhqL}>h!c)1#2I_)1$Xl-KKIhW1|f1jS}$jZgS
z;*a*r3pAjt@!7+)Fh8dV)<uD#a}du3T2-#bn#|Q8&4?;5p$lQ$Nqu!agr*oDGsF00
zLoj)89XB+^8QpT|n>kLV@7r#bBI&HJO8m*a1;Mva{oSt=ZKmXSEYe8#5Mk7C7lUnG
zh)af%O@%(|uhTkmDttF$id07GU8eXT%rf=P;x;6T06M?7XCoU^jNQ@AmT%?({Yhse
z7{BV6W}V#n-Dd(!e5g$yP472rxJ@5dnANHGRhTS~YMD>xLgf@yPG5P|nZ8uJzmG{^
z2pj;46p#3I`MdP;=)9Sah9fc#R}BEatKcR^^)Shimw3nE3AzC}GFF;3)U1pMYnG0F
z7zT#im~}sxb(@4H01C2&DmBh@dm5;A&<JE5DXXJHKk6^;$5=CMS$&IP$8S!RZmuvU
zADhvj=iS8LTXiFC$h};WO+HngIT`7JvyP&L1c=@qkMK|KUO&TYRUJNwBsy@n^<Xj<
zL<$iy+$1}rI<p+~sXLQSv?IEHqbXLPg)Eik&p;$(Wres@#KO%RPT>Vs=!&xsicVy>
z5wlXjScOH(BW5e<>p9nJIny~LjJ1fr9EoeVk7CRNWD>Bb1EA72d*gZatMQU<{yv27
zpJ-skf2Q<{Mgd9I_TG%)e;fUIg;dX$qu)$CcVko1Nk-;XZ|_Z1s$YRwtRqkJdI&Bx
zn>M4^G@}$xwxK}aepH{8>44lkR6Lh%e@k?S8FEb>FaRHWBlX!x#4JQOrOL2^AifCW
zcua7-{Gd;I_enp*oaH`y8D*ja+fXHsGc>6n>ZnNWgqU8kLP0u%0<~S%JTZQ57o>9^
zLDEMbA}XH^yYn2TX~p&OJz_2FDU;4MCDYG`PW}+2SoQg~d_>~4=bAevbKYW6ccCYV
z_1H&*(M@s9x-n-2aESuOWSi}^@6-kB14Ld-+Z3$=?k>h0+3pO>*!L-h;-0NA*~7AT
z0$R6dT9g3Hl5)$5jeY-0RpAvZKFmKSr@!si@527G{VPZPXT~2%>Yw!o<9Cqx-;Dp6
ztNt_hk7V`F`h%<d`}`xd{fql&&iWVs?~>NP_yK>*|99^CZ<W7KUjI~~`rVrTgUUbW
tuz!8izxS_y=}%()-CO>-%D>b9x0_W}KtTLM1@ZUM@(Kn<km8TK{{razet-Y~

literal 4525
zcmaJ_byQT{+a-q@Lb^qA2!|Y%W&{R?Zcq^kVTK_E1PQ5eKtMu37<%Y#FhGz7$w842
zkdl%Tq(p(A`o4Z2>#cLwy8E7W_u2co=Z|~VehjpUNf-%!4wXEJ%CCn%ZzMm^%>yBB
z@UIM-KN%={FIx{AM_11?T=l=G(f^H$azD%0`3s-*ANeR7ZyUS+b0H@H{#f-X`RUuJ
zAEo&65)erJ$0~hyFGm+gKl|G-M`wFo8&?~Iy$9IN*~Zhe!(6?J0ZO+Keo+kF*r@I9
z<KuHHo{+f>yuR5TIo}&WMfTi)RLIq!laPiJ_w%h!@+Q9u5n(7(GTfoSzv0{6gS3h1
ztuZ&A9GE-x``h%$S~$Q(5?KnDMS60xt4splXQp{$>k_<E>eBXms>X2lYhEZ{=8{;!
z!AV!*`e`}5IzG<i3UcKx_!fy}NE8cX$gCv71(2Rra=M6}H`nBZ+I`XBj{*XPHyO*d
zr7W2-qJpJXPgWtrjo`N&wu=QlGx5=rfa!AyKAvwC(VJ-|QQX+wIPQpd-7i)n(!Y%0
z5Q31L0V###Im}9PzxLv)sg<8D0_evV>SljW$l*iZ=Mb_u3LcI=zDA(zIK#)=x*w%%
zczn3IcX~z=gM2+zx7m7xR0AK2w=CycTQTO))|gp@@d6@4DRr~tN5*p3*{0WvHdobl
zIq6{4O{<>resjY6VjF16-4xV7&DComT-1B@4t0P<HfMeBGM>J-JbV|(jTE^w{4;Ws
zwxZt0nbcp}F5U?1Fk4fy@$u^!^0*qZ20M;h$1K#`+~pS)Wq)XLtFKznsS?$uw&v|D
zf3W*P@%{t}<R}|+D29?vP|X+*dzy|7thn^lj%-6^!fBKp&^tU4jf@!f_Ig#e%20o~
zBNY_Rvbhjez9P|AYoBQ$mii>p?D7o_KAaK!se+<#Njntuv~#}&)fvCvI7qR^7P2At
zGMNu+`we$=-_p$kSwbV|m$V_lDy>BLCQG1j@{1Qg1@&kjLLfe&D$C8?8dE4qB6(T1
z77%&o7~MZK8bI7RVLh@>Of0|#qtL&kvViKEN=wjG7eC1Yo(Q$xRv{zH+|Y5&cyMaX
zRmW{A3eQ8}6t`hK&lo8B7^)S!y7rbrcM2V-Zu5r{L5?%#>8>b_QL9X>m!uc-&)8N}
znHFcRELW8xm?5AoARw9L+qJj(;ARYAqG#%cTAr!VxyMCUX2pia)~A7@*tVGbZcSe~
z6e(vn!DD(z*1|6IT{A80yq-g089c!jVyIAWwLFNAumyD%_}BVRi5GvUhf}GXMi|Sg
zo2v7TiobhvI9Z^F+EJ_U6bwA+;m@+g$<*=~*M&&+_vm!t7K5&5q-dly2M5hdCm;t*
zWKfbJB~?tBIeb~z5>0lg`N_yq;dK}W+~B*pJEYc7w3Ov(5139hw4u;&NN~y?M`Zc!
z>n}+hPR(wk76Au)K+#dB0HM(R(*+eN{q<WQJ!lTnsG%WXuEw?a&I#e01ev0B+V6Bp
zp0)~!3BwVvdnjKkQ-{pqVlerbQ}|_k!dt0`WD?3OHi?2|$8Ovc9Huz)R0A2skJHV&
zxqlxYntEDrC_Si26Q+kxI)C0|t~(Owzi?i=?&~OIuBiqW4LQBx|2>~^ss7l;Y$T>b
zwh}dv<p9M>`FBvWI=oPUJ_-C(7UEHz>~xSC#OHno7rfzqFT=TeXQ`|5(1y)QR{3h4
zSpy<ec6?x`O)f^i*eka2D2KG<aQcClcZSLk1!Hu9qykQ%=qS0Wy`sI6+I3Tfgdxb^
z;)F4fLxdf!s&Y3ly9awwsY!;~#GvS*79djC1jd9ZDFXB+?+}^GSm-bwetH5F*&Wy`
zG~j|TQs+UZjvTGJDItb^DlQngqEZ9eJ*KNjf|7V>IXkEvPZteLG(`4$<4JU(A}ODq
z8wcf1GY;f+Mke8nFb+sC8!{UyTW)}iFncN5bv-xw>Ww;MWGoG*Rce%RHlJJwrPGjS
z(^2MAUds!63zo*8sW`W7jaD9k0SzKvsy^y{NG0+M81A+Wf#!-@y=(nj?~PY5A1LqR
z)rUo{m*ZKEpZgvjRx&Xj<rcOP08LmQv{I^Ckf|EBw@6^-ShJBA%Z*th3_Vtm7)jQ?
z#C!?89IjXjN@hWk2aeR5^h_aUSP~^)N@q+lE7CeuOvBz+u4uC|;IrnVRpm+}EkqCF
zPzG1fj$FS|ikHNfuliR)jdwSq;#giCKPPzd&BorNG7ryCM9gra|32Mq3>)A6jv>?5
zw|S{6=Cq6TSqsaulD93Bu09EL*TqaQjYOzr9(>O7$8pdI`0>9l3=XBGOrF(qFV3NK
z<vb*HU+7>1tq-izJ3pSUf)DBF5ACjvHA$ClPCwdwush|wT5YT`Bp3#U!Ly96Ezn*b
z4XFFzw?4j`E}M{83){QkaWNz5nsf8zCF8Z1V8Kb&%fnw`*krS3E~D=yTmpz+O(>5}
z%vg%%&U|)W%j7E3Az$CEOYvlRfn}-K)E(@E%3<a6wZz~PPd~LmJU^{ePdQe9a+y3b
z+nVJUA2BKnJ3Thi;Z!UnBNmEv{8Wj&d&^6Vdr+`HqsZNc-u!5lb%{X&){-jUzE?sN
zeX_yHyQDqqAG7ShrkwSSY%EhYwu}9n+U|Kf&P+*ZMMWPM$I~y0E6SDIM<Z+uGKt6N
zaOvAuBJWwIiu9@b)I4$E|Il15dMsqeu45VwF*$%g$yTzKU~QF&eM>C#niY260sizx
zE`mO527wEjOVUY`Z{L_tOR(C{xV*F$o&aB!UC)hG4nmL*q{#d2Te_*5`Hj9DHZEq{
z>oeQzU-IFJXhv)#H=<`tHm^NIG;D$8>`j{+mI}7p+04y_QVCZlJWaGT1P4|XVh}O#
z1)<k%H$Q#bv#;4(9DMV(yCM1GcguWzzcvMC(Szvp!xU&xGX-S(%jS9IWRe$8$y5|y
zt$bH}B{<+Hz6O-O&wFb|3=+r|KXjvO1CQ@QT+DiR>Oq_?@At+eEQ~3rLe5&U?-)LQ
z&Fb}XbV_cjQDN;Z?;`g`w?;sq*@<7AV7h{@hk4ESr0-3ao(*z&B?%PQp6Y2G&tZah
zR!9j|G*q}bg_)Ab^pGpGRc>^X=vPj(&^RgD-o$X?d&FqZkk)E{JYeQ(3*HrqXt!>E
zNl{9!HfPQ3{p|T;br5r`{kgzLJ-Qzg_`b@%QOt(XZ)%2!QGQU%27a@X!<6C;SQLlD
zIff;PtVM}%VmsN4S~yM-d_+l6%SkUXQUuv)rr&WTSMFvplx3ckqN;oLp5dc5B*_(9
zTVR(F5f^8;j0#7zWM(eAAOR?}1;I{1uEU5W(Y3CL5GDYM=qyT8OJ{2{){W6k(YPxy
z59Mg~di5jdo*C|H<ya3mJ#;V>v!7PIbJd7ffb$CtCv`E7;UzkreMdrDD_=$dwwlP*
z7!nY3pUj@fIawEzjyE2MwYvl6uy!+7Uxdveuh1G^N{_P>$PMFj%?<#(;}VUc^aXj*
z=978i8!(Y<*qDsSj`W9x=E7fmqxfoy0@USlK0AjH5ul*BOO!ca!*UIN4%|g{`uwhr
zN{YSIb1BSTuLP2^srT>fUU|R3C@13lj87S!ZO2SVWp_Sn0*fYJKIpLQSAAHU=9}vx
zYp0~)!e32Cbx0!M<qAx!Bag}!cBDw+#pT&s(A<QJB0Gay;AI^m*r_eOvVzRcn{F-a
zWsBo-!DaZS6pn2Fqcm&3>uDEE5)-PFak!QwebB`!Q|q*r{n(<5RjSs@WS=>L>L46$
z=X_&Tz$cKG0pp$FV=TycGMTbc^#x!K(}Ar8&VQaQGJ)09H5cUriGPkp$pHj=_Naop
z*K8#Sy#(T?d-gU#5!|;u#2@v4r600kG$%)mTtrWgql0%a#a{_cN%w08))LclLg>Wi
zX<yD?D$x!#+scH#NSxKP#Vjll^8?nlo6*$psM|AQD62)yY=!YLgQ)MqmhuAekrws#
zr-W+pq~T0u>Usy7y~1~CaEFQ`0?*bA%bWQQ6V%b%)oO1f`6)PH0}77{`=Vv0pbO`*
zGt%AP1%)T89eJLF!?cio1Q4#t8?D=B?(17g))o9kbKv-|0ftGG#1|ZFsbk;Y$8M@9
zKLu0;fiwV**U^StszuVA!l-(|mJA8XCdsfSJIM?KaEIC(2l^OWsS3%ZgOn}tD?9YH
zrdJ$zb>s!Av%usiNH-xpUa%POk^H!qidjJ1BGE*OBrgwCstq@sjEm2CTAYW@tHv-&
z?VvuLYrx7IpL_qg?ozu^c4er6Pl#$hZ#jIP7SuZP=Db0q<w<ai^Gl6~yL+1cSlX>I
zuyP%#gsFOl9!kd3Df!MjN#i6tMQ6}%SSwOOBqsNnojUriePRtVlk)W|W?zu0Ano0B
zyh~lbYP5xdVVC6X$IuikgVxm5QU%5c_`A_!31X(foPm~l=*2Hz-@LOtcI>GNuCjO_
ztaHd~q4Pl;8Xt2RS6fb@@6!f}yCxrBr89dd<D3W7I(I^L2iPrp8Q!AjZboh@yOviX
zNxHfqoL;a8LT9zIktg!dP=QGE$E>iR;?#WMRk1OkCLE)d98VcR7&UT5!`}hSUvUC6
zH@YBcqS@Q}J@{eESAFs?=5Lj9noC4(%(VJay`}0RRr-#dB~>-gr$!1nsZA2xR>;h$
zwsRQXBtXe8QP(BEw(YbyVrs^4@nyP~$*<s4+eA&}3i|t(muGk?iY%vzIBq;XKlyxP
z0~E{k&_*b=YMR-fF+GE4{1!#Bsq7+H!5t*LgfcSfr`CkG=4rns?uHp#wwltW?|fiw
zeeLKn=y(%dY%M}^OuR#7c^Zu6E!iOSL=WlSzG?lLq(LjXce^d4W@U=kOwgT?Hxnvh
zB^U+1=B3L<(fu6l`aov+USR!aCGrB4@JC^xwMK7+F_7>e(r9NMYyf!HL!060Jk`a;
z+MBJZ7d5>9fjeYqw}lQ{WX0_RK@uG(wI61Sw<z^y+8sD95pp+d0qY+L=t|B`Lv}Tp
z%Tm;1!(b!ioY3YxZb;2aO333xlUbXqG%Str{!WZ$`Lhp2R7u?*Wh+&@be>}$@J;D&
zGED$(-C49ZU3@X<YyadG01<9~uL=KAb(XL9&cb!k6Zc-e`qOS5bsWE!9s{fO1h#^y
z8+cMVMrorex=dxDO-Q6n@Na>f|3|$2Iq3d?U-6uhfalkYkbsq7BLJJ}Io?nB8y$`k
zf6f0(m4@J~>W>WlOZERF{aO8!+&}bx<8Pm{`hO4pXZ7{|rvI}IaMmNNfGGdxH~hxm
zUS~c2-Yhul5%`ZDf3yzHI&JVwmjBwVKe2J}<zIH|pBfCmop^q@)cuFkzqcFC*03EI
hVE?m*<CE53-oMd6n-uUvoPhMlMNULO5KH@W_CLf~%jW<9


From a932525ebc11d122328c5ff4f2cb3c572af3b395 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 16 Feb 2012 20:46:23 +0100
Subject: [PATCH 02/26] cosmetics

---
 .../src/org/jetbrains/jps/javac/JavacFileManager.java    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
index 19c920988311..73e238f9bdd7 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
@@ -37,15 +37,6 @@ class JavacFileManager extends ForwardingJavaFileManager<StandardJavaFileManager
     myContext = context;
   }
 
-  @Override
-  public Iterable<JavaFileObject> list(Location location,
-                                       String packageName,
-                                       Set<JavaFileObject.Kind> kinds,
-                                       boolean recurse) throws IOException {
-    final Iterable<JavaFileObject> result = super.list(location, packageName, kinds, recurse);
-    return result;
-  }
-
   public boolean setOutputDirectories(final Map<File, Set<File>> outputDirToSrcRoots) {
     for (File outputDir : outputDirToSrcRoots.keySet()) {
       // this will validate output dirs

From 638d10cd7f0d59167d94f065425802fe85a6f6de Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 16 Feb 2012 21:39:37 +0100
Subject: [PATCH 03/26] exclude optimized file managers from compile

---
 .idea/compiler.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e211f38930a2..5ee3618d9424 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,7 +6,8 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
-      <file url="file://$PROJECT_DIR$/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OptimizedFileManager.java" />
+      <file url="file://$PROJECT_DIR$/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java" />
+      <file url="file://$PROJECT_DIR$/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager.java" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />

From f66ba64dd16e73944f650d8d03ef9f504e187aca Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Thu, 2 Feb 2012 19:11:54 +0400
Subject: [PATCH 04/26] RUBY-10336  Project panel icon is IDEA instead of
 RubyMine one

---
 .../ide/projectView/impl/ProjectViewImpl.java |  1 -
 .../impl/ProjectViewToolWindowFactory.java    | 11 +++++++--
 .../openapi/wm/ToolWindowFactoryEx.java       | 23 +++++++++++++++++++
 .../openapi/wm/impl/ToolWindowImpl.java       |  3 +++
 .../wm/impl/ToolWindowManagerImpl.java        |  2 +-
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 platform/platform-api/src/com/intellij/openapi/wm/ToolWindowFactoryEx.java

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
index bc4775a86308..1f18a4de9dcd 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
@@ -541,7 +541,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
     if (toolWindow != null) {
       myContentManager = toolWindow.getContentManager();
       toolWindow.setContentUiType(ToolWindowContentUiType.getInstance("combo"), null);
-      toolWindow.setIcon(IconLoader.getIcon(ApplicationInfoEx.getInstanceEx().getToolWindowIconUrl()));
       ((ToolWindowEx)toolWindow).setAdditionalGearActions(myActionGroup);
       toolWindow.getComponent().putClientProperty(ToolWindowContentUi.HIDE_ID_LABEL, "true");
     } else {
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewToolWindowFactory.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewToolWindowFactory.java
index 9439d10b902d..898d75208dc5 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewToolWindowFactory.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewToolWindowFactory.java
@@ -17,16 +17,23 @@
 package com.intellij.ide.projectView.impl;
 
 import com.intellij.ide.projectView.ProjectView;
+import com.intellij.openapi.application.ex.ApplicationInfoEx;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ToolWindow;
-import com.intellij.openapi.wm.ToolWindowFactory;
+import com.intellij.openapi.wm.ToolWindowFactoryEx;
 
 /**
  * @author yole
  */
-public class ProjectViewToolWindowFactory implements ToolWindowFactory, DumbAware {
+public class ProjectViewToolWindowFactory implements ToolWindowFactoryEx, DumbAware {
   public void createToolWindowContent(Project project, ToolWindow toolWindow) {
     ((ProjectViewImpl) ProjectView.getInstance(project)).setupImpl(toolWindow);
   }
+
+  @Override
+  public void init(ToolWindow window) {
+    window.setIcon(IconLoader.getIcon(ApplicationInfoEx.getInstanceEx().getToolWindowIconUrl()));
+  }
 }
diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowFactoryEx.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowFactoryEx.java
new file mode 100644
index 000000000000..2179adb0cefe
--- /dev/null
+++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowFactoryEx.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.wm;
+
+/**
+ * @author Dennis.Ushakov
+ */
+public interface ToolWindowFactoryEx extends ToolWindowFactory {
+  void init(ToolWindow window);
+}
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
index f6abd3eb539c..acd3c3e49bd2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
@@ -434,6 +434,9 @@ public final class ToolWindowImpl implements ToolWindowEx {
 
   public void setContentFactory(ToolWindowFactory contentFactory) {
     myContentFactory = contentFactory;
+    if (contentFactory instanceof ToolWindowFactoryEx) {
+      ((ToolWindowFactoryEx)contentFactory).init(this);
+    }
   }
 
   public void ensureContentInitialized() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 3cba80b1fe26..9bb168f78455 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -472,7 +472,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
       (ToolWindowImpl)registerToolWindow(bean.id, label, toolWindowAnchor, myProject, DumbService.isDumbAware(factory),
                                          bean.canCloseContents);
     toolWindow.setContentFactory(factory);
-    if (bean.icon != null) {
+    if (bean.icon != null && toolWindow.getIcon() == null) {
       Icon icon = IconLoader.findIcon(bean.icon, factory.getClass());
       if (icon == null) {
         try {

From c3fd706e9233a703fe8aa8402d88f4412edf4639 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Fri, 3 Feb 2012 14:48:35 +0400
Subject: [PATCH 05/26] show message when find/replace is not available

---
 .../find/actions/FindInPathAction.java        | 24 ++++++++++++++-----
 .../find/actions/ReplaceInPathAction.java     | 20 ++++++++--------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java b/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java
index 0da8d30e4b3f..81f8dc59d76e 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/FindInPathAction.java
@@ -18,17 +18,33 @@
 package com.intellij.find.actions;
 
 import com.intellij.find.findInProject.FindInProjectManager;
+import com.intellij.notification.NotificationGroup;
+import com.intellij.notification.NotificationType;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.wm.ToolWindowId;
 
 public class FindInPathAction extends AnAction implements DumbAware {
+  static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.toolWindowGroup("FindInPath", ToolWindowId.FIND, false);
+
   @Override
   public void actionPerformed(AnActionEvent e) {
     DataContext dataContext = e.getDataContext();
     Project project = e.getData(PlatformDataKeys.PROJECT);
-    
-    FindInProjectManager.getInstance(project).findInProject(dataContext);
+
+    FindInProjectManager findManager = FindInProjectManager.getInstance(project);
+    if (!findManager.isEnabled()) {
+      showNotAvailableMessage(e, project);
+      return;
+    }
+
+    findManager.findInProject(dataContext);
+  }
+
+  static void showNotAvailableMessage(AnActionEvent e, Project project) {
+    final String message = "'" + e.getPresentation().getText() + "' is not available while search is in progress";
+    NOTIFICATION_GROUP.createNotification(message, NotificationType.WARNING).notify(project);
   }
 
   @Override
@@ -36,9 +52,5 @@ public class FindInPathAction extends AnAction implements DumbAware {
     Presentation presentation = e.getPresentation();
     Project project = e.getData(PlatformDataKeys.PROJECT);
     presentation.setEnabled(project != null);
-    if (project != null) {
-      FindInProjectManager findManager = FindInProjectManager.getInstance(project);
-      presentation.setEnabled(findManager.isEnabled());
-    }
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java b/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java
index 9e98a01c057f..4e603990b349 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/ReplaceInPathAction.java
@@ -26,20 +26,20 @@ public class ReplaceInPathAction extends AnAction {
   public void actionPerformed(AnActionEvent e) {
     DataContext dataContext = e.getDataContext();
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    
-    ReplaceInProjectManager.getInstance(project).replaceInProject(dataContext);
+
+    ReplaceInProjectManager replaceManager = ReplaceInProjectManager.getInstance(project);
+    if (!replaceManager.isEnabled()) {
+      FindInPathAction.showNotAvailableMessage(e, project);
+      return;
+    }
+
+    replaceManager.replaceInProject(dataContext);
   }
 
   @Override
   public void update(AnActionEvent event){
     Presentation presentation = event.getPresentation();
-    Project project = PlatformDataKeys.PROJECT.getData(event.getDataContext());
-    if (project == null) {
-      presentation.setEnabled(false);
-    }
-    else {
-      ReplaceInProjectManager replaceManager = ReplaceInProjectManager.getInstance(project);
-      presentation.setEnabled(replaceManager.isEnabled());
-    }
+    Project project = event.getData(PlatformDataKeys.PROJECT);
+    presentation.setEnabled(project != null);
   }
 }

From 77d61223405299cb32cbfc09fc7eabfddb89f713 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Mon, 6 Feb 2012 13:04:20 +0400
Subject: [PATCH 06/26] Highlighting settings for Ruby dot and colons

---
 colorSchemes/src/colorSchemes/all_hallows_eve.xml |  6 ++++++
 colorSchemes/src/colorSchemes/blackboard.xml      |  6 ++++++
 colorSchemes/src/colorSchemes/cobalt.xml          | 10 ++++++++++
 colorSchemes/src/colorSchemes/monokai.xml         |  6 ++++++
 colorSchemes/src/colorSchemes/rails_casts.xml     |  6 ++++++
 colorSchemes/src/colorSchemes/twilight.xml        |  6 ++++++
 colorSchemes/src/colorSchemes/vibrant_ink.xml     |  6 ++++++
 7 files changed, 46 insertions(+)

diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index 4341b2a6d87f..8a7a00df87d9 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -1189,6 +1189,12 @@
     <option name="RUBY_COMMA">
       <value />
     </option>
+    <option name="RUBY_DOT">
+      <value />
+    </option>
+    <option name="RUBY_COLON">
+      <value />
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933CC" />
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index 628b64a3d212..c40d69a47cfa 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -1155,6 +1155,12 @@
     <option name="RUBY_COMMA">
       <value />
     </option>
+    <option name="RUBY_DOT">
+      <value />
+    </option>
+    <option name="RUBY_COLON">
+      <value />
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="AEAEAE" />
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index c1bfc2eddbfb..0e8c26a57c6c 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1286,6 +1286,16 @@
         <option name="FOREGROUND" value="E1EFFF" />
       </value>
     </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND" value="E1EFFF" />
+      </value>
+    </option>
+    <option name="RUBY_COLON">
+      <value>
+        <option name="FOREGROUND" value="E1EFFF" />
+      </value>
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="0088FF" />
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index b8f840fae410..020adb3a04b5 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -1177,6 +1177,12 @@
     <option name="RUBY_COMMA">
       <value />
     </option>
+    <option name="RUBY_DOT">
+      <value />
+    </option>
+    <option name="RUBY_COLON">
+      <value />
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="75715E" />
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index dea1a85e9fd4..fd78acbc87e5 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1200,6 +1200,12 @@
     <option name="RUBY_COMMA">
       <value />
     </option>
+    <option name="RUBY_DOT">
+      <value />
+    </option>
+    <option name="RUBY_COLON">
+      <value />
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="BC9458" />
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index c7688a7fcf4f..09ed47d72a2f 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1191,6 +1191,12 @@
     <option name="RUBY_COMMA">
       <value />
     </option>
+    <option name="RUBY_DOT">
+      <value />
+    </option>
+    <option name="RUBY_COLON">
+      <value />
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="5F5A60" />
diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index 1fbea39470f2..db57045f08bb 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -1195,6 +1195,12 @@
     <option name="RUBY_COMMA">
       <value />
     </option>
+    <option name="RUBY_DOT">
+      <value />
+    </option>
+    <option name="RUBY_COLON">
+      <value />
+    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933CC" />

From ffcb2846d160a14324610441cfadb10fd52d6d1d Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Mon, 6 Feb 2012 13:41:17 +0400
Subject: [PATCH 07/26] Perform time check not only in EDT

---
 .../com/intellij/codeInsight/dataflow/DFAEngine.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/dataflow/DFAEngine.java b/platform/lang-impl/src/com/intellij/codeInsight/dataflow/DFAEngine.java
index 4e1cfeec7ff9..79c7266f5d17 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/dataflow/DFAEngine.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/dataflow/DFAEngine.java
@@ -16,7 +16,6 @@ package com.intellij.codeInsight.dataflow;
 
 import com.intellij.codeInsight.controlflow.ControlFlowUtil;
 import com.intellij.codeInsight.controlflow.Instruction;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;
 
@@ -24,7 +23,7 @@ import java.util.*;
 
 public class DFAEngine<E> {
   private static final Logger LOG = Logger.getInstance(DFAEngine.class.getName());
-  private static final double TIME_LIMIT = 3 * 10e9;
+  private static final double TIME_LIMIT = 10e9; // In nanoseconds, 10e9 = 1 sec
 
   private final Instruction[] myFlow;
 
@@ -47,7 +46,7 @@ public class DFAEngine<E> {
 
   public List<E> performDFA(final List<E> info) throws DFALimitExceededException {
     if (LOG.isDebugEnabled()) {
-      LOG.debug("Perfoming DFA\n" + "Instance: " + myDfa + " Semilattice: " + mySemilattice);
+      LOG.debug("Performing DFA\n" + "Instance: " + myDfa + " Semilattice: " + mySemilattice + "\nCon");
     }
 
 // initializing dfa
@@ -70,10 +69,7 @@ public class DFAEngine<E> {
       // Check if canceled
       ProgressManager.checkCanceled();
 
-      // Check time limit only in EDT
-      if (!ApplicationManager.getApplication().isUnitTestMode() &&
-          ApplicationManager.getApplication().isDispatchThread() &&
-          System.nanoTime() - startTime > TIME_LIMIT) {
+      if (System.nanoTime() - startTime > TIME_LIMIT) {
         if (LOG.isDebugEnabled()) {
           LOG.debug("Time limit exceeded");
         }

From 4746fbacc3b326dc53ffb3c0315038ae4b517f64 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Mon, 6 Feb 2012 18:57:11 +0400
Subject: [PATCH 08/26] use slide dialog

---
 .../configuration/CommonContentEntriesEditor.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
index 06821c652915..1b644f6bdc61 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
@@ -43,6 +43,7 @@ import com.intellij.openapi.vfs.ex.VirtualFileManagerAdapter;
 import com.intellij.openapi.vfs.ex.VirtualFileManagerEx;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.roots.ToolbarPanel;
+import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -385,11 +386,15 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor {
     }
 
     public void actionPerformed(AnActionEvent e) {
-      VirtualFile[] files = FileChooser.chooseFiles(myProject, myDescriptor, myLastSelectedDir);
-      if (files.length > 0) {
-        myLastSelectedDir = files[0];
-        addContentEntries(files);
-      }
+      FileChooser.chooseFilesWithSlideEffect(myDescriptor, myProject, myLastSelectedDir, new Consumer<VirtualFile[]>() {
+        @Override
+        public void consume(VirtualFile[] files) {
+          if (files.length > 0) {
+            myLastSelectedDir = files[0];
+            addContentEntries(files);
+          }
+        }
+      });
     }
 
     @Nullable

From 054240f8e39062fb8bfb9a030393cb456911d6d2 Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Tue, 7 Feb 2012 13:01:41 +0400
Subject: [PATCH 09/26] color schemes updated: coffee script, ruby colors fixed

---
 .../src/colorSchemes/all_hallows_eve.xml      | 2348 +++++++++++----
 colorSchemes/src/colorSchemes/blackboard.xml  | 2325 +++++++++++----
 colorSchemes/src/colorSchemes/cobalt.xml      | 2444 ++++++++++++----
 colorSchemes/src/colorSchemes/monokai.xml     | 2325 +++++++++++----
 colorSchemes/src/colorSchemes/rails_casts.xml | 2573 ++++++++++++++---
 colorSchemes/src/colorSchemes/twilight.xml    | 2331 +++++++++++----
 colorSchemes/src/colorSchemes/vibrant_ink.xml | 2338 +++++++++++----
 7 files changed, 13013 insertions(+), 3671 deletions(-)

diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index 8a7a00df87d9..3fdd590e17d4 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -1,1585 +1,2847 @@
-<scheme name="AllHallowsEve" 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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<scheme name="AllHallowsEve" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="644d6e" />
-    <option name="CARET_ROW_COLOR" value="333300" />
-    <option name="WHITESPACES" value="404040" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="INDENT_GUIDE" value="404040" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="000000" />
+    <option name="CARET_COLOR" value="ffffff"/>
+    <option name="CARET_ROW_COLOR" value="333300"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="0"/>
+    <option name="INDENT_GUIDE" value="404040"/>
+    <option name="SELECTION_BACKGROUND" value="644d6e"/>
+    <option name="WHITESPACES" value="404040"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.CLASS_NAME">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.COMMA">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.PROTOTYPE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="cc7833"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="HAML_PARENTHS">
-      <value />
-    </option>
     <option name="HAML_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_RUBY_START">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_WS_REMOVAL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_XHTML">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="434242" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="434242"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
-    <option name="JS.COMMA">
-      <value />
-    </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.PARENTHS">
-      <value />
-    </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
-      </value>
-    </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DECORATOR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
-      <value />
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_COMMA">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_IDENTIFIER">
-      <value />
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_METHOD_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_COMMA">
-      <value />
-    </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
-    <option name="SQL_PROCEDURE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
-    <option name="SQL_SEMICOLON">
-      <value />
-    </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="3387cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
-    </option>
-    <option name="XML_TAG_DATA">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>
 </scheme>
+
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index c40d69a47cfa..91f5adf0e53b 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -1,1554 +1,2827 @@
-<scheme name="Blackboard" 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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<scheme name="Blackboard" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="253B76" />
-    <option name="CARET_ROW_COLOR" value="1a1e2e" />
-    <option name="WHITESPACES" value="484b58" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="INDENT_GUIDE" value="484b58" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="0C1021" />
+    <option name="CARET_COLOR" value="ffffff"/>
+    <option name="CARET_ROW_COLOR" value="1a1e2e"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="c1021"/>
+    <option name="INDENT_GUIDE" value="484b58"/>
+    <option name="SELECTION_BACKGROUND" value="253b76"/>
+    <option name="WHITESPACES" value="484b58"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.COMMA">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.IDENTIFIER">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="fbde2d"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.URL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="GHERKIN_TEXT">
-      <value />
-    </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
-      <value />
-    </option>
-    <option name="HAML_PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_CODE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_START">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="HAML_TEXT">
-      <value />
-    </option>
-    <option name="HAML_WS_REMOVAL">
-      <value />
-    </option>
     <option name="HAML_XHTML">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
-    <option name="JS.COMMA">
-      <value />
-    </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
-      <value />
-    </option>
-    <option name="JS.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-      </value>
-    </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
-      <value />
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_COMMA">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_IDENTIFIER">
-      <value />
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_COMMA">
-      <value />
-    </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
-    <option name="SQL_PROCEDURE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
-    <option name="SQL_SEMICOLON">
-      <value />
-    </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="0C1021" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="c1021"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F8F8F8" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="f8f8f8"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="d8fa3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
-    </option>
-    <option name="XML_TAG_DATA">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>
 </scheme>
+
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index 0e8c26a57c6c..398db36aaa2d 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1,1727 +1,3187 @@
-<scheme name="Cobalt" 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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<scheme name="Cobalt" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="85533a" />
-    <option name="CARET_ROW_COLOR" value="001629" />
-    <option name="WHITESPACES" value="25425c" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="INDENT_GUIDE" value="25425c" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="002240" />
+    <option name="CARET_COLOR" value="ffffff"/>
+    <option name="CARET_ROW_COLOR" value="1629"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="2240"/>
+    <option name="INDENT_GUIDE" value="25425c"/>
+    <option name="SELECTION_BACKGROUND" value="85533a"/>
+    <option name="WHITESPACES" value="25425c"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BRACE">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BRACKET">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.PARENTHESIS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.RANGE">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.SPLAT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
+        <option name="FOREGROUND" value="ff80e1"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="ff9d00"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="80FFBB" />
+        <option name="FOREGROUND" value="80ffbb"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="GHERKIN_TEXT">
-      <value />
-    </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="223545" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223545"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_RUBY_START">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="HAML_TEXT">
-      <value />
-    </option>
     <option name="HAML_WS_REMOVAL">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_XHTML">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_PARENTH">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
-      </value>
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
-      </value>
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="223545" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223545"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
-      </value>
-    </option>
-    <option name="RUBY_COMMA">
-      <value>
-        <option name="FOREGROUND" value="E1EFFF" />
-      </value>
-    </option>
-    <option name="RUBY_DOT">
-      <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_COLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_COMMA">
+      <value>
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="223545" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="223545"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="80FFBB" />
+        <option name="FOREGROUND" value="80ffbb"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="EB939A" />
+        <option name="FOREGROUND" value="eb939a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="800f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
     <option name="SQL_DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
     <option name="SQL_PARENS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PROCEDURE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
     <option name="SQL_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="002240" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="2240"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ff628c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
-      </value>
-    </option>
-    <option name="XML_TAG_DATA">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e1efff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="88ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>
 </scheme>
+
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index 020adb3a04b5..eadeda1b9810 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -1,1584 +1,2807 @@
-<scheme name="Monokai" 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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<scheme name="Monokai" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="49483E" />
-    <option name="CARET_ROW_COLOR" value="25241a" />
-    <option name="WHITESPACES" value="49483E" />
-    <option name="CARET_COLOR" value="F8F8F0" />
-    <option name="INDENT_GUIDE" value="49483E" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="272822" />
+    <option name="CARET_COLOR" value="f8f8f0"/>
+    <option name="CARET_ROW_COLOR" value="25241a"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="272822"/>
+    <option name="INDENT_GUIDE" value="49483e"/>
+    <option name="SELECTION_BACKGROUND" value="49483e"/>
+    <option name="WHITESPACES" value="49483e"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.COMMA">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.IDENTIFIER">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="f92672"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fd971f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="75715E" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="75715E" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="GHERKIN_TEXT">
-      <value />
-    </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
-      <value />
-    </option>
-    <option name="HAML_PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_CODE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_START">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="HAML_TEXT">
-      <value />
-    </option>
-    <option name="HAML_WS_REMOVAL">
-      <value />
-    </option>
     <option name="HAML_XHTML">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
-    <option name="JS.COMMA">
-      <value />
-    </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fd971f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.PARENTHS">
-      <value />
-    </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-      </value>
-    </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="a6e22e"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_BRACKETS">
-      <value />
+    <option name="RUBY_COLON">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMA">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
-    </option>
-    <option name="RUBY_COLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_CONSTANT">
-      <value />
-    </option>
-    <option name="RUBY_CONSTANT_DECLARATION">
-      <value />
-    </option>
     <option name="RUBY_CVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_IDENTIFIER">
-      <value />
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fd971f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fd971f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fd971f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0"/>
+        <option name="BACKGROUND" value="f92672"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_COMMA">
-      <value />
-    </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
-    <option name="SQL_PROCEDURE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
-    <option name="SQL_SEMICOLON">
-      <value />
-    </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="F8F8F2" />
-        <option name="BACKGROUND" value="272822" />
+        <option name="FOREGROUND" value="f8f8f2"/>
+        <option name="BACKGROUND" value="272822"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F8F8F2" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="f8f8f2"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ae81ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
-    </option>
-    <option name="XML_TAG_DATA">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>
 </scheme>
+
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index fd78acbc87e5..e4e7d434a95b 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1,1612 +1,3247 @@
-<scheme name="RailsCasts" 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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<scheme name="RailsCasts" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="545c73" />
-    <option name="CARET_ROW_COLOR" value="333435" />
-    <option name="WHITESPACES" value="404040" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="INDENT_GUIDE" value="404040" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="2B2B2B" />
+    <option name="CARET_COLOR" value="ffffff"/>
+    <option name="CARET_ROW_COLOR" value="333435"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="2b2b2b"/>
+    <option name="INDENT_GUIDE" value="404040"/>
+    <option name="SELECTION_BACKGROUND" value="545c73"/>
+    <option name="WHITESPACES" value="404040"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BRACE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.BRACKET">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="519f50"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.RANGE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.SPLAT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="cc7833"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="519F50" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TEXT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="232323" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="232323"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_RUBY_START">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TEXT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_WS_REMOVAL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_XHTML">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="6d9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="519f50"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.GLOBAL_FUNCTION">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="E6E1DC" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="e6e1dc"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="JS.STATIC_MEMBER_FUNCTION">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="REGEXP.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="232323" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="232323"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_COMMA">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IDENTIFIER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="990000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="990000"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_DATABASE_OBJECT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_IDENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_IDENT_DELIMITED">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_LOCAL_ALIAS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_PARAMETER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_PARENS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_PROCEDURE">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SCHEMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_TABLE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="E6E1DC" />
-        <option name="BACKGROUND" value="2B2B2B" />
+        <option name="FOREGROUND" value="e6e1dc"/>
+        <option name="BACKGROUND" value="2b2b2b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="E6E1DC" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="e6e1dc"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6d9cbe"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
-    </option>
-    <option name="XML_TAG_DATA">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="bc9458"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>
 </scheme>
+
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index 09ed47d72a2f..7eafd6ca8440 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1,1610 +1,2847 @@
-<scheme name="Twilight" 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" />
+<?xml version="1.0" encoding="UTF-8"?>
+<scheme name="Twilight" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="3c3f42" />
-    <option name="CARET_ROW_COLOR" value="1b1b1b" />
-    <option name="WHITESPACES" value="4e4e4e" />
-    <option name="CARET_COLOR" value="A7A7A7" />
-    <option name="INDENT_GUIDE" value="4e4e4e" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="141414" />
+    <option name="CARET_COLOR" value="a7a7a7"/>
+    <option name="CARET_ROW_COLOR" value="1b1b1b"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="141414"/>
+    <option name="INDENT_GUIDE" value="4e4e4e"/>
+    <option name="SELECTION_BACKGROUND" value="3c3f42"/>
+    <option name="WHITESPACES" value="4e4e4e"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.COMMA">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.IDENTIFIER">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="cda869"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="9B859D" />
+        <option name="FOREGROUND" value="9b859d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="GHERKIN_TEXT">
-      <value />
-    </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
-      <value />
-    </option>
-    <option name="HAML_PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_CODE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_START">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="HAML_TEXT">
-      <value />
-    </option>
-    <option name="HAML_WS_REMOVAL">
-      <value />
-    </option>
     <option name="HAML_XHTML">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
-    <option name="JS.COMMA">
-      <value />
-    </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.PARENTHS">
-      <value />
-    </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
-      </value>
-    </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="202020" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="202020"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
-      <value />
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_COMMA">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="9B859D" />
+        <option name="FOREGROUND" value="9b859d"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_COMMA">
-      <value />
-    </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
-    <option name="SQL_PROCEDURE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
-    <option name="SQL_SEMICOLON">
-      <value />
-    </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="141414" />
+        <option name="FOREGROUND" value="f8f8f8"/>
+        <option name="BACKGROUND" value="141414"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F8F8F8" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="f8f8f8"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="cf6a4c"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
-    </option>
-    <option name="XML_TAG_DATA">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="5f5a60"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>
 </scheme>
+
diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index db57045f08bb..65965dc0258b 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -1,1602 +1,2854 @@
-<scheme name="VibrantInk" 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" />
+<scheme name="VibrantInk" version="1" parent_scheme="Default">
+  <option name="LINE_SPACING" value="1.0"/>
+  <option name="EDITOR_FONT_SIZE" value="12"/>
+  <option name="EDITOR_FONT_NAME" value="Monaco"/>
   <colors>
-    <option name="SELECTION_BACKGROUND" value="2e3f34" />
-    <option name="CARET_ROW_COLOR" value="333300" />
-    <option name="WHITESPACES" value="404040" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="INDENT_GUIDE" value="404040" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="000000" />
+    <option name="CARET_COLOR" value="ffffff"/>
+    <option name="CARET_ROW_COLOR" value="333300"/>
+    <option name="CONSOLE_BACKGROUND_KEY" value="0"/>
+    <option name="INDENT_GUIDE" value="404040"/>
+    <option name="SELECTION_BACKGROUND" value="2e3f34"/>
+    <option name="WHITESPACES" value="404040"/>
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="743d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="743d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFCC00" />
+        <option name="FOREGROUND" value="ffcc00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.COMMA">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FFCC00" />
+        <option name="FOREGROUND" value="ffcc00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.LOCAL_VARIABLE">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FFCC00" />
+        <option name="FOREGROUND" value="ffcc00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffb3b3" />
+        <option name="FOREGROUND" value="ffb3b3"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GRAY_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="a7a7a7" />
+        <option name="FOREGROUND" value="a7a7a7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="68e868" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff2eff" />
+        <option name="FOREGROUND" value="ff2eff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ff6767" />
+        <option name="FOREGROUND" value="ff6767"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="e4e4ff" />
+        <option name="FOREGROUND" value="e4e4ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_USER_INPUT">
       <value>
-        <option name="FOREGROUND" value="6ae96a" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6ae96a"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754200" />
+        <option name="FOREGROUND" value="754200"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="ff6600"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CSS.TAG_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="71d7d7" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="71d7d7"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffc2c2" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ffc2c2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="339999" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
-        <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="c0c0c0"/>
+        <option name="EFFECT_TYPE" value="3"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DIFF_CONFLICT">
       <value>
-        <option name="BACKGROUND" value="763f34" />
-        <option name="ERROR_STRIPE_COLOR" value="ff6647" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="763f34"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff6647"/>
       </value>
     </option>
     <option name="DIFF_DELETED">
       <value>
-        <option name="BACKGROUND" value="5b5b5b" />
-        <option name="ERROR_STRIPE_COLOR" value="747474" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5b5b5b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="747474"/>
       </value>
     </option>
     <option name="DIFF_INSERTED">
       <value>
-        <option name="BACKGROUND" value="2f632f" />
-        <option name="ERROR_STRIPE_COLOR" value="99ff99" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="2f632f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ff99"/>
       </value>
     </option>
     <option name="DIFF_MODIFIED">
       <value>
-        <option name="BACKGROUND" value="465983" />
-        <option name="ERROR_STRIPE_COLOR" value="99ccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="465983"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="99ccff"/>
       </value>
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_FILTER">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
-        <option name="BACKGROUND" value="30322b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="30322b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ff6767"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff0000"/>
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
-        <option name="BACKGROUND" value="c7c7ff" />
+        <option name="FOREGROUND" value="101"/>
+        <option name="BACKGROUND" value="c7c7ff"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLDED_TEXT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3c3d3c" />
-        <option name="BACKGROUND" value="101010" />
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="FOREGROUND" value="3c3d3c"/>
+        <option name="BACKGROUND" value="101010"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="3c3d3c"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="BACKGROUND" value="161717" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND" value="161717"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="aa4e00"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="f49810"/>
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GHERKIN_TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_CLASS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="HAML_PARENTHS">
-      <value />
-    </option>
     <option name="HAML_RUBY_CODE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_RUBY_START">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_TAG_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_WS_REMOVAL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HAML_XHTML">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="0F0F0F" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="f0f0f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="339999" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR" value="c7c7ff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="3c3c57" />
-        <option name="ERROR_STRIPE_COLOR" value="ccccff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="3c3c57"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ccccff"/>
       </value>
     </option>
     <option name="IMPLICIT_ANONYMOUS_CLASS_PARAMETER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="333434" />
-        <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="333434"/>
+        <option name="EFFECT_TYPE" value="2"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffffcc"/>
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="INSTANCE_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR" value="80807f"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
       <value>
-        <option name="BACKGROUND" value="423535" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="423535"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
-    <option name="JS.COMMA">
-      <value />
-    </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
       <value>
-        <option name="BACKGROUND" value="223f22" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223f22"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.DOC_TAG">
       <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="979748" />
+        <option name="FOREGROUND" value="979748"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INSTANCE_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="64a2a2" />
+        <option name="FOREGROUND" value="64a2a2"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="JS.PARENTHS">
-      <value />
-    </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
-      </value>
-    </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STATIC_MEMBER_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="80807f"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PY.BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BRACKETS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.BUILTIN_NAME">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.COMMA">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FFCC00" />
+        <option name="FOREGROUND" value="ffcc00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFCC00" />
+        <option name="FOREGROUND" value="ffcc00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.PARENTHS">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_DEFINITION">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.BOLD">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.FIXED">
       <value>
-        <option name="BACKGROUND" value="48485f" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="48485f"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INLINE">
       <value>
-        <option name="BACKGROUND" value="273627" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="273627"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.INTERPRETED">
       <value>
-        <option name="BACKGROUND" value="4d5d3d" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4d5d3d"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.ITALIC">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
-      <value />
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_COMMA">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_CONSTANT_DECLARATION">
-      <value />
-    </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="RUBY_DOT">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="RUBY_IDENTIFIER">
-      <value />
+    <option name="RUBY_INTERPOLATED_STRING">
+      <value>
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="68e868"/>
+        <option name="BACKGROUND" value="481515"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FFCC00" />
+        <option name="FOREGROUND" value="ffcc00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_NTH_REF">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="44B4CC" />
+        <option name="FOREGROUND" value="44b4cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_CONSTANT">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_RULE">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4f4f82" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4f4f82"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="6e3b3b"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_COMMA">
-      <value />
-    </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="339999" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
-    <option name="SQL_PROCEDURE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
-    <option name="SQL_SEMICOLON">
-      <value />
-    </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="fda5ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="5f5f00"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff00"/>
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="c7c7ff" />
-        <option name="FONT_TYPE" value="3" />
-        <option name="ERROR_STRIPE_COLOR" value="ff" />
+        <option name="FOREGROUND" value="c7c7ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="3"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ff"/>
       </value>
     </option>
     <option name="WARNING_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="4a3f10"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR" value="ffffff"/>
+        <option name="EFFECT_TYPE" value="1"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffff00"/>
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="472c47" />
-        <option name="ERROR_STRIPE_COLOR" value="ffcdff" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="472c47"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR" value="ffcdff"/>
       </value>
     </option>
     <option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
       <value>
-        <option name="BACKGROUND" value="623062" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="623062"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="99CC99" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="99cc99"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="2"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="339999" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="339999"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
-    </option>
-    <option name="XML_TAG_DATA">
       <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="1"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
-      <value />
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF6600" />
+        <option name="FOREGROUND" value="ff6600"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="66FF00" />
+        <option name="FOREGROUND" value="66ff00"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
   </attributes>

From 2bd1a6efc272566a80dfd6e1ce5b2e7db97cb39a Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Tue, 7 Feb 2012 13:04:08 +0400
Subject: [PATCH 10/26] cosmetics

---
 colorSchemes/src/colorSchemes/vibrant_ink.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index 65965dc0258b..bba5d97a2b42 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <scheme name="VibrantInk" version="1" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0"/>
   <option name="EDITOR_FONT_SIZE" value="12"/>

From f5f761b1a18867bb11240fe91a49a80447d81895 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Wed, 8 Feb 2012 16:13:38 +0400
Subject: [PATCH 11/26] cleanup

---
 .../application/options/TabbedLanguageCodeStylePanel.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
index a5a1928b55ec..7b419a66dada 100644
--- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
@@ -125,14 +125,13 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane
     final Container component = (Container)e;
     final Component[] components = component.getComponents();
     final Component last = components[components.length - 1];
-    initCopyFromMenu(last);
+    initCopyFromMenu();
     myCopyFromMenu.show(last, 0, last.getHeight() + 3);
   }
 
-  private void initCopyFromMenu(Component component) {
+  private void initCopyFromMenu() {
     if (myCopyFromMenu == null) {
       myCopyFromMenu = new JPopupMenu();
-      //component.add(myCopyFromMenu);
       setupCopyFromMenu(myCopyFromMenu);
     }
   }

From 0162ace20c81f87d40a171d8b6750cc97a4457c2 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Wed, 8 Feb 2012 16:58:03 +0400
Subject: [PATCH 12/26] RUBY-8701  Yaml code style annoyance

---
 .../intellij/application/options/IndentOptionsEditor.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java b/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java
index 3bc87d62fa13..b4b859f9d841 100644
--- a/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java
+++ b/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java
@@ -25,11 +25,11 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 
 public class IndentOptionsEditor extends OptionGroup {
-  private JTextField myIndentField;
+  protected JTextField myIndentField;
   protected JCheckBox myCbUseTab;
-  private JTextField myTabSizeField;
-  private JLabel myTabSizeLabel;
-  private JLabel myIndentLabel;
+  protected JTextField myTabSizeField;
+  protected JLabel myTabSizeLabel;
+  protected JLabel myIndentLabel;
 
   public JPanel createPanel() {
     addComponents();

From 55a622bfd8a37316192999a70aa96614684626d3 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Wed, 8 Feb 2012 17:34:33 +0400
Subject: [PATCH 13/26] IDEA-62372  Fix GTK + Background in Changes | Log

---
 platform/util/src/com/intellij/util/ui/UIUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index 305ee0edd531..20e4e38d3bc9 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -567,7 +567,8 @@ public class UIUtil {
   }
 
   public static Color getTableBackground() {
-    return UIManager.getColor("Table.background");
+    // Under GTK+ L&F "Table.background" often has main panel color, which looks ugly
+    return isUnderGTKLookAndFeel() ? getTreeTextBackground() : UIManager.getColor("Table.background");
   }
 
   public static Color getTableSelectionForeground() {
@@ -583,7 +584,7 @@ public class UIUtil {
   }
 
   public static Color getListBackground() {
-    // Fixes most of the GTK+ L&F glitches
+    // Under GTK+ L&F "Table.background" often has main panel color, which looks ugly
     return isUnderGTKLookAndFeel() ? getTreeTextBackground() : UIManager.getColor("List.background");
   }
 

From 9b78e39c17a5f394bb69c48e013bbf1d0c6ebea6 Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Wed, 8 Feb 2012 17:33:28 +0400
Subject: [PATCH 14/26] ruby run configurations: rake task "as before run"
 target

---
 .../intellij/execution/ExecutionHelper.java   | 106 ++++++++++++++++--
 .../src/com/intellij/execution/Output.java    |  10 ++
 .../intellij/execution/OutputListener.java    |  21 +++-
 3 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
index 04bb7f3c4020..f06fd54c5805 100644
--- a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
@@ -41,6 +41,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.pom.Navigatable;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
@@ -88,7 +89,7 @@ public class ExecutionHelper {
           return;
         }
 
-        final RailsErrorViewPanel errorTreeView = new RailsErrorViewPanel(myProject);
+        final ErrorViewPanel errorTreeView = new ErrorViewPanel(myProject);
         try {
           openMessagesView(errorTreeView, myProject, tabDisplayName);
         }
@@ -113,7 +114,79 @@ public class ExecutionHelper {
     });
   }
 
-  private static void openMessagesView(@NotNull final RailsErrorViewPanel errorTreeView,
+  public static void showOutput(@NotNull final Project myProject,
+                                @NotNull final Output output,
+                                @NotNull final String tabDisplayName,
+                                @Nullable final VirtualFile file,
+                                final boolean activateWindow) {
+    final String stdout = output.getStdout();
+    final String stderr = output.getStderr();
+    if (ApplicationManager.getApplication().isUnitTestMode() && !(stdout.isEmpty() || stderr.isEmpty())) {
+      throw new RuntimeException("STDOUT:\n" + stdout + "\nSTDERR:\n" + stderr);
+    }
+
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
+      public void run() {
+        if (myProject.isDisposed()) return;
+
+        final String stdOutTitle = "[Stdout]:";
+        final String stderrTitle = "[Stderr]:";
+        final ErrorViewPanel errorTreeView = new ErrorViewPanel(myProject);
+        try {
+          openMessagesView(errorTreeView, myProject, tabDisplayName);
+        }
+        catch (NullPointerException e) {
+          final StringBuilder builder = new StringBuilder();
+          builder.append(stdOutTitle).append("\n").append(stdout != null ? stdout : "<empty>").append("\n");
+          builder.append(stderrTitle).append("\n").append(stderr != null ? stderr : "<empty>");
+          Messages.showErrorDialog(builder.toString(), "Process Output");
+          return;
+        }
+
+        if (!StringUtil.isEmpty(stdout)) {
+          final String[] stdoutLines = StringUtil.splitByLines(stdout);
+          if (stdoutLines.length > 0) {
+            if (StringUtil.isEmpty(stderr)) {
+              // Only stdout available
+              errorTreeView.addMessage(MessageCategory.SIMPLE, stdoutLines, file, -1, -1, null);
+            }
+            else {
+              // both stdout and stderr available, show as groups
+              if (file == null) {
+                errorTreeView.addMessage(MessageCategory.SIMPLE, stdoutLines, stdOutTitle, new FakeNavigatable(), null, null, null);
+              }
+              else {
+                errorTreeView.addMessage(MessageCategory.SIMPLE, new String[]{stdOutTitle}, file, -1, -1, null);
+                errorTreeView.addMessage(MessageCategory.SIMPLE, new String[]{""}, file, -1, -1, null);
+                errorTreeView.addMessage(MessageCategory.SIMPLE, stdoutLines, file, -1, -1, null);
+              }
+            }
+          }
+        }
+        if (!StringUtil.isEmpty(stderr)) {
+          final String[] stderrLines = StringUtil.splitByLines(stderr);
+          if (stderrLines.length > 0) {
+            if (file == null) {
+              errorTreeView.addMessage(MessageCategory.SIMPLE, stderrLines, stderrTitle, new FakeNavigatable(), null, null, null);
+            }
+            else {
+              errorTreeView.addMessage(MessageCategory.SIMPLE, new String[]{stderrTitle}, file, -1, -1, null);
+              errorTreeView.addMessage(MessageCategory.SIMPLE, new String[0], file, -1, -1, null);
+              errorTreeView.addMessage(MessageCategory.SIMPLE, stderrLines, file, -1, -1, null);
+            }
+          }
+        }
+        errorTreeView
+          .addMessage(MessageCategory.SIMPLE, new String[]{"Process finished with exit code " + output.getExitCode()}, null, -1, -1, null);
+
+        if (activateWindow) {
+          ToolWindowManager.getInstance(myProject).getToolWindow(ToolWindowId.MESSAGES_WINDOW).activate(null);
+        }
+      }
+    });
+  }
+
+  private static void openMessagesView(@NotNull final ErrorViewPanel errorTreeView,
                                        @NotNull final Project myProject,
                                        @NotNull final String tabDisplayName) {
     CommandProcessor commandProcessor = CommandProcessor.getInstance();
@@ -267,8 +340,8 @@ public class ExecutionHelper {
     });
   }
 
-  public static class RailsErrorViewPanel extends NewErrorTreeViewPanel {
-    public RailsErrorViewPanel(final Project project) {
+  public static class ErrorViewPanel extends NewErrorTreeViewPanel {
+    public ErrorViewPanel(final Project project) {
       super(project, "reference.toolWindows.messages");
     }
 
@@ -282,9 +355,9 @@ public class ExecutionHelper {
                                             @NotNull final ProcessHandler processHandler,
                                             @NotNull final ExecutionMode mode,
                                             @NotNull final GeneralCommandLine cmdline) {
-    executeExternalProcess(myProject,  processHandler,  mode, cmdline.getCommandLineString());
+    executeExternalProcess(myProject, processHandler, mode, cmdline.getCommandLineString());
   }
-  
+
   public static void executeExternalProcess(@Nullable final Project myProject,
                                             @NotNull final ProcessHandler processHandler,
                                             @NotNull final ExecutionMode mode,
@@ -349,7 +422,7 @@ public class ExecutionHelper {
 
       private final Runnable myCancelListener = new Runnable() {
         public void run() {
-          for (; ;) {
+          for (; ; ) {
             if ((myProgressIndicator != null && (myProgressIndicator.isCanceled()
                                                  || !myProgressIndicator.isRunning()))
                 || (cancelableFun != null && cancelableFun.fun(null).booleanValue())
@@ -405,7 +478,7 @@ public class ExecutionHelper {
           try {
             final boolean finished = processHandler.waitFor(1000 * timeout);
             if (!finished) {
-              final String msg = "Timeout (" + timeout + " sec) on executing: " +  presentableCmdline;
+              final String msg = "Timeout (" + timeout + " sec) on executing: " + presentableCmdline;
               LOG.error(msg);
               processHandler.destroyProcess();
             }
@@ -424,4 +497,21 @@ public class ExecutionHelper {
       }
     };
   }
+
+  public static class FakeNavigatable implements Navigatable {
+    @Override
+    public void navigate(boolean requestFocus) {
+      // Do nothing
+    }
+
+    @Override
+    public boolean canNavigate() {
+      return false;
+    }
+
+    @Override
+    public boolean canNavigateToSource() {
+      return false;
+    }
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/Output.java b/platform/lang-impl/src/com/intellij/execution/Output.java
index 267046ce7464..fa3638036e98 100644
--- a/platform/lang-impl/src/com/intellij/execution/Output.java
+++ b/platform/lang-impl/src/com/intellij/execution/Output.java
@@ -25,10 +25,16 @@ package com.intellij.execution;
 public class Output {
   private final String stdout;
   private final String stderr;
+  private int exitCode;
 
   public Output(String stdout, String stderr) {
+    this(stdout, stderr, -1);
+  }
+
+  public Output(String stdout, String stderr, int exitCode) {
     this.stdout = stdout;
     this.stderr = stderr;
+    this.exitCode = exitCode;
   }
 
   public String getStdout() {
@@ -38,4 +44,8 @@ public class Output {
   public String getStderr() {
     return stderr;
   }
+
+  public int getExitCode() {
+    return exitCode;
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/OutputListener.java b/platform/lang-impl/src/com/intellij/execution/OutputListener.java
index 35ac3a13e87b..cff48771d321 100644
--- a/platform/lang-impl/src/com/intellij/execution/OutputListener.java
+++ b/platform/lang-impl/src/com/intellij/execution/OutputListener.java
@@ -7,11 +7,12 @@ import com.intellij.openapi.util.Key;
 import org.jetbrains.annotations.NotNull;
 
 /**
-* @author oleg
-*/
+ * @author oleg
+ */
 public class OutputListener extends ProcessAdapter {
   private final StringBuilder out;
   private final StringBuilder err;
+  private int myExitCode;
 
   public OutputListener() {
     out = new StringBuilder();
@@ -24,15 +25,23 @@ public class OutputListener extends ProcessAdapter {
   }
 
   public void onTextAvailable(ProcessEvent event, Key outputType) {
-    if (outputType == ProcessOutputTypes.STDOUT) {
-      out.append(event.getText());
-    }
     if (outputType == ProcessOutputTypes.STDERR) {
       err.append(event.getText());
     }
+    else if (outputType == ProcessOutputTypes.SYSTEM) {
+      // skip 
+    }
+    else {
+      out.append(event.getText());
+    }
+  }
+
+  @Override
+  public void processTerminated(ProcessEvent event) {
+    myExitCode = event.getExitCode();
   }
 
   public Output getOutput() {
-    return new Output(out.toString(), err.toString());
+    return new Output(out.toString(), err.toString(), myExitCode);
   }
 }

From 81d109846ddd3a720ecb4db44e8331bdc1f1abfe Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 9 Feb 2012 12:58:37 +0400
Subject: [PATCH 15/26] Fix wrong usage of DefaultCellRenderer usage in Code
 Style Scheme popup

---
 .../options/codeStyle/CodeStyleSchemesPanel.java   | 14 ++++++--------
 .../intellij/ide/ui/ListCellRendererWrapper.java   |  6 ++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
index 44c19f2799df..65e521cafd2c 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
@@ -16,9 +16,9 @@
 
 package com.intellij.application.options.codeStyle;
 
-import com.intellij.application.options.CodeStyleAbstractPanel;
+import com.intellij.ide.ui.ListCellRendererWrapper;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.psi.codeStyle.*;
+import com.intellij.psi.codeStyle.CodeStyleScheme;
 import com.intellij.ui.components.JBScrollPane;
 import org.jetbrains.annotations.Nullable;
 
@@ -26,7 +26,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
 
 public class CodeStyleSchemesPanel{
@@ -58,10 +58,9 @@ public class CodeStyleSchemesPanel{
         }
       }
     });
-    myCombo.setRenderer(new DefaultListCellRenderer() {
+    myCombo.setRenderer(new ListCellRendererWrapper(myCombo.getRenderer()) {
       @Override
-      public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-        Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+      public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) {
         Font font = myDefaultComboFont;
         if (value instanceof CodeStyleScheme) {
           CodeStyleScheme scheme = (CodeStyleScheme)value;
@@ -69,8 +68,7 @@ public class CodeStyleSchemesPanel{
             font = myBoldComboFont;
           }
         }
-        component.setFont(font);
-        return component;
+        setFont(font);
       }
     });
     
diff --git a/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java b/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java
index 1b564213017d..05b9c9c31223 100644
--- a/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java
+++ b/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java
@@ -35,6 +35,7 @@ public abstract class ListCellRendererWrapper<T> implements ListCellRenderer {
   private String myText;
   private String myToolTipText;
   private Color myForeground;
+  private Font myFont;
 
   /**
    * A combo box for which this cell renderer is created should be passed here.
@@ -66,6 +67,7 @@ public abstract class ListCellRendererWrapper<T> implements ListCellRenderer {
         label.setIcon(myIcon);
         if (myText != null) label.setText(myText);
         if (myForeground != null) label.setForeground(myForeground);
+        if (myFont != null) label.setFont(myFont);
         label.setToolTipText(myToolTipText);
       }
       return component;
@@ -104,4 +106,8 @@ public abstract class ListCellRendererWrapper<T> implements ListCellRenderer {
   public void setForeground(final Color foreground) {
     myForeground = foreground;
   }
+  
+  public void setFont(final Font font) {
+    myFont = font;
+  }
 }

From ffc7c2ea97dc79bf5263386aadbfbb292089040b Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 9 Feb 2012 13:01:49 +0400
Subject: [PATCH 16/26] Fix background in Quick Lists Panel

---
 .../com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java
index 7ed0d9a1231f..38dcaf526566 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.util.Factory;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
@@ -322,6 +323,7 @@ public class QuickListsPanel extends JPanel implements SearchableConfigurable, C
   private static class MyQuickListCellRenderer extends ColoredListCellRenderer {
     @Override
     protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
+      setBackground(UIUtil.getListBackground(selected));
       QuickList quickList = (QuickList)value;
       append(quickList.getDisplayName());
     }

From ac71347e6eaf4c356758c3a0aa5bfc65ea3c5201 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 9 Feb 2012 14:03:27 +0400
Subject: [PATCH 17/26] Fix DefaultListCellRenderer in comboboxes

---
 .../openapi/fileTypes/impl/FileTypePatternDialog.java |  8 +++-----
 .../jetbrains/android/logcat/EditLogFilterDialog.java |  9 ++++-----
 .../android/run/ExtendedDeviceChooserDialog.java      | 11 +++++------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java
index 1844a11d6954..7818201cde28 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.fileTypes.impl;
 
+import com.intellij.ide.ui.ListCellRendererWrapper;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.TemplateLanguageFileType;
@@ -22,7 +23,6 @@ import com.intellij.psi.templateLanguages.TemplateDataLanguageMappings;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -51,10 +51,9 @@ public class FileTypePatternDialog {
       for (Language language : languages) {
         model.addElement(language);
       }
-      myLanguageCombo.setRenderer(new DefaultListCellRenderer() {
+      myLanguageCombo.setRenderer(new ListCellRendererWrapper(myLanguageCombo.getRenderer()) {
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-          super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) {
           setText(value == null ? "" : ((Language) value).getDisplayName());
           if (value != null) {
             final FileType type = ((Language)value).getAssociatedFileType();
@@ -62,7 +61,6 @@ public class FileTypePatternDialog {
               setIcon(type.getIcon());
             }
           }
-          return this;
         }
       });
       myLanguageCombo.setSelectedItem(templateDataLanguage);
diff --git a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
index fc8bff1c052e..d93d519ba1fd 100644
--- a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
+++ b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
@@ -4,6 +4,7 @@ import com.android.ddmlib.Log;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.ide.ui.ListCellRendererWrapper;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
@@ -26,7 +27,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Set;
@@ -93,13 +93,12 @@ class EditLogFilterDialog extends DialogWrapper {
     myPidFieldWrapper.add(myPidField);
 
     myLogLevelCombo.setModel(new EnumComboBoxModel<Log.LogLevel>(Log.LogLevel.class));
-    myLogLevelCombo.setRenderer(new DefaultListCellRenderer() {
+    myLogLevelCombo.setRenderer(new ListCellRendererWrapper(myLogLevelCombo.getRenderer()) {
       @Override
-      public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+      public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) {
         if (value != null) {
-          value = StringUtil.capitalize(((Log.LogLevel)value).getStringValue().toLowerCase());
+          setText(StringUtil.capitalize(((Log.LogLevel)value).getStringValue().toLowerCase()));
         }
-        return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
       }
     });
 
diff --git a/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java b/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java
index efebf6a3c07b..61a17ded1d1a 100644
--- a/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java
+++ b/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java
@@ -7,6 +7,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Disposer;
+import com.intellij.ui.HtmlListCellRenderer;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NonNls;
@@ -14,7 +15,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -73,15 +73,14 @@ public class ExtendedDeviceChooserDialog extends DialogWrapper {
     Disposer.register(myDisposable, myAvdCombo);
 
 
-    myAvdCombo.getComboBox().setRenderer(new DefaultListCellRenderer() {
+    myAvdCombo.getComboBox().setRenderer(new HtmlListCellRenderer(myAvdCombo.getComboBox().getRenderer()) {
       @Override
-      public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+      protected void doCustomize(JList list, Object value, int index, boolean selected, boolean hasFocus) {
         if (value == null) {
-          value = myAvdCombo.getComboBox().isEnabled()
+          setText(myAvdCombo.getComboBox().isEnabled()
                   ? "<html><font color='red'>[none]</font></html>"
-                  : "[none]";
+                  : "[none]");
         }
-        return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
       }
     });
     myComboBoxWrapper.add(myAvdCombo);

From 4ec8089429ef55b618632de4272d006a993b5ec1 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Thu, 9 Feb 2012 14:15:23 +0400
Subject: [PATCH 18/26] EA-33604

---
 .../intellij/execution/ui/layout/impl/RunnerContentUi.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
index 59c1dfd29bc9..ee32bf865fe1 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
@@ -388,7 +388,10 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
     if (target != null) {
       target.add(content, null);
     } else {
-      final Point location = gridCell.getLocation();
+      Point location = gridCell.getLocation();
+      if (location == null) {
+        location = getComponent().getLocationOnScreen();
+      }
       location.translate(size.width / 2, size.height / 2);
       getDockManager().createNewDockContainerFor(content, new RelativePoint(location));
     }

From 45002425ed780d237f8413065bcb770c6388fbf1 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Fri, 10 Feb 2012 11:36:09 +0400
Subject: [PATCH 19/26] RUBY-10412 Autoscroll-to-source is broken in scopes
 view

---
 .../src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java | 4 ++++
 .../src/com/intellij/ide/scopeView/ScopeViewPane.java      | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
index 650d2fb3472d..42f51ec78d08 100644
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
@@ -462,6 +462,10 @@ public class ScopeTreeViewPanel extends JPanel implements Disposable {
     myTreeExpansionMonitor.restore();
   }
 
+  ActionCallback getActionCallback() {
+    return myActionCallback;
+  }
+
   private class MyTreeCellRenderer extends ColoredTreeCellRenderer {
     public void customizeCellRenderer(JTree tree,
                                       Object value,
diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
index 0ac0f595d497..d1396c61645b 100644
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
@@ -226,4 +226,11 @@ public class ScopeViewPane extends AbstractProjectViewPane {
     }
     return myViewPanel != null ? myViewPanel.getData(dataId) : null;
   }
+
+  @Override
+  public ActionCallback getReady(@NotNull Object requestor) {
+    final ActionCallback callback = myViewPanel.getActionCallback();
+    return myViewPanel == null ? new ActionCallback.Rejected() :
+           callback != null ? callback : new ActionCallback.Done();
+  }
 }

From 015bb7a13029197f8bafddde44cefb62aa27b1b5 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Mon, 13 Feb 2012 12:22:29 +0400
Subject: [PATCH 20/26] persist order + cleanup

---
 .../src/com/intellij/ide/actions/GotoRelatedFileAction.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java
index b65d12bcf804..c6bb21885a87 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java
@@ -32,8 +32,6 @@ import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.ui.popup.list.ListPopupImpl;
 import com.intellij.util.Processor;
-import com.intellij.util.containers.hash.*;
-import com.intellij.util.containers.hash.HashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -41,7 +39,6 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.util.*;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -64,6 +61,7 @@ public class GotoRelatedFileAction extends AnAction {
       return;
     }
     if (ApplicationManager.getApplication().isUnitTestMode()) {
+      //noinspection UseOfSystemOutOrSystemErr
       System.out.println(items);
     }
     createPopup(items, "Go to Related Files").showInBestPositionFor(context);
@@ -210,7 +208,7 @@ public class GotoRelatedFileAction extends AnAction {
       }
     }
 
-    Set<GotoRelatedItem> items = new HashSet<GotoRelatedItem> ();
+    Set<GotoRelatedItem> items = new LinkedHashSet<GotoRelatedItem>();
 
     for (GotoRelatedProvider provider : Extensions.getExtensions(GotoRelatedProvider.EP_NAME)) {
       items.addAll(provider.getItems(contextElement));

From 03b54a6e6a2e053e2f9fdac727ce6c74ef2ac97f Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Fri, 10 Feb 2012 21:42:51 +0400
Subject: [PATCH 21/26] TextFieldWithAutocompletion: new life (better
 implementation: autopopup, completion hint)

---
 .../ui/TextFieldWithAutoCompletion.java       | 253 ++++++++----------
 ...extFieldWithAutoCompletionContributor.java | 132 +++++++++
 ...xtFieldWithAutoCompletionListProvider.java | 146 ++++++++++
 .../src/META-INF/LangExtensions.xml           | 141 ++++++----
 .../android/logcat/EditLogFilterDialog.java   | 120 ++-------
 .../javaee/HtmlLanguageLevelForm.java         |   5 +-
 6 files changed, 506 insertions(+), 291 deletions(-)
 create mode 100644 platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java
 create mode 100644 platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java

diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
index 80097f16e2e2..8c256ddf9e0f 100644
--- a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
+++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
@@ -16,179 +16,154 @@
 
 package com.intellij.ui;
 
-import com.intellij.codeInsight.lookup.LookupArranger;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.codeInsight.lookup.LookupManager;
-import com.intellij.codeInsight.lookup.impl.LookupImpl;
-import com.intellij.lang.Language;
-import com.intellij.openapi.actionSystem.ActionManager;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.IdeActions;
-import com.intellij.openapi.editor.Document;
+import com.intellij.codeInsight.hint.HintManager;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.editor.event.*;
+import com.intellij.openapi.editor.event.DocumentAdapter;
+import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.openapi.editor.ex.FocusChangeListener;
 import com.intellij.openapi.fileTypes.PlainTextLanguage;
+import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileFactory;
-import com.intellij.psi.codeStyle.NameUtil;
-import com.intellij.util.Function;
-import com.intellij.util.LocalTimeCounter;
-import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.text.Matcher;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import javax.swing.*;
+import java.util.Collection;
 
 /**
  * @author Roman Chernyatchik
- *
- * It is text field with autocompletion from list of values.
- *
- * Autocompletion is implemented via LookupManager.
- * Use setVariants(..) set list of values for autocompletion.
- * For variants you can use not only instances of PresentableLookupValue, but
- * also instances of LookupValueWithPriority and LookupValueWithUIHint  
+ *         <p/>
+ *         It is text field with autocompletion from list of values.
+ *         <p/>
+ *         Autocompletion is implemented via LookupManager.
+ *         Use setVariants(..) set list of values for autocompletion.
+ *         For variants you can use not only instances of PresentableLookupValue, but
+ *         also instances of LookupValueWithPriority and LookupValueWithUIHint
  */
-public class TextFieldWithAutoCompletion extends EditorTextField {
-  private List<LookupElement> myVariants;
-  private String myAdText;
-  
-  private Comparator<LookupElement> myComparator = new Comparator<LookupElement>() {
-    public int compare(final LookupElement item1,
-                       final LookupElement item2) {
-      return item1.getLookupString().compareTo(item2.getLookupString());
-    }
-  };
+public class TextFieldWithAutoCompletion<T> extends LanguageTextField {
+
+  public static final TextFieldWithAutoCompletionListProvider EMPTY_COMPLETION = new StringsCompletionProvider(null, null);
+  private final boolean myShowAutocompletionIsAvailableHint;
 
   public TextFieldWithAutoCompletion() {
-    super();
+    // For UI designer
+    this(null, null, false);
   }
 
-  public TextFieldWithAutoCompletion(final Project project) {
-    super(createDocument(project), project, PlainTextLanguage.INSTANCE.getAssociatedFileType());
+  public TextFieldWithAutoCompletion(final Project project,
+                                     final TextFieldWithAutoCompletionListProvider<T> provider,
+                                     final boolean showAutocompletionIsAvailableHint) {
+    super(PlainTextLanguage.INSTANCE, project, "");
 
-    new VariantsCompletionAction();
-  }
+    myShowAutocompletionIsAvailableHint = showAutocompletionIsAvailableHint;
 
-  private static Document createDocument(@Nullable final Project project) {
-    if (project == null) {
-      return EditorFactory.getInstance().createDocument("");
-    }
-
-    final Language language = PlainTextLanguage.INSTANCE;
-    final PsiFileFactory factory = PsiFileFactory.getInstance(project);
-    final FileType fileType = language.getAssociatedFileType();
-    assert fileType != null;
-
-    final long stamp = LocalTimeCounter.currentTime();
-    final PsiFile psiFile = factory.createFileFromText("Dummy." + fileType.getDefaultExtension(), fileType, "", stamp, true, false);
-    final Document document = PsiDocumentManager.getInstance(project).getDocument(psiFile);
-    assert document != null;
-    return document;
-  }
-
-  private class VariantsCompletionAction extends AnAction {
-    private VariantsCompletionAction() {
-      final AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_CODE_COMPLETION);
-      if (action != null) {
-        registerCustomShortcutSet(action.getShortcutSet(), TextFieldWithAutoCompletion.this);
-      }
-    }
-
-    public void actionPerformed(final AnActionEvent e) {
-      showLookup();
+    if (provider != null) {
+      TextFieldWithAutoCompletionContributor.installCompletion(getDocument(), project, provider, true);
     }
   }
 
-  public void showLookup() {
-    if (LookupManager.getInstance(getProject()).getActiveLookup() != null) return;
-    final Editor editor = getEditor();
-    assert editor != null;
+  public static TextFieldWithAutoCompletion<String> create(final Project project,
+                                                           @NotNull final Collection<String> items,
+                                                           @Nullable final Icon icon,
+                                                           final boolean showAutocompletionIsAvailableHint) {
+    return new TextFieldWithAutoCompletion<String>(project, new StringsCompletionProvider(items, icon), showAutocompletionIsAvailableHint);
+  }
 
-    editor.getSelectionModel().removeSelection();
-    final String lookupPrefix = getCurrentLookupPrefix(getCurrentTextPrefix());
-    final LookupImpl lookup =
-      (LookupImpl)LookupManager.getInstance(getProject()).createLookup(editor,
-                                                                       calcLookupItems(lookupPrefix),
-                                                                       StringUtil.notNullize(lookupPrefix),
-                                                                       LookupArranger.DEFAULT);
-    final String advertisementText = getAdvertisementText();
-    if (!StringUtil.isEmpty(advertisementText)) {
-      lookup.setAdvertisementText(advertisementText);
-      lookup.refreshUi(false);
+  @Override
+  protected EditorEx createEditor() {
+    final EditorEx editor = super.createEditor();
+
+    if (!myShowAutocompletionIsAvailableHint) {
+      return editor;
     }
-    lookup.showLookup();
-  }
 
-  public void setAdvertisementText(@Nullable String text) {
-    myAdText = text;
-  }
+    final String completionShortcutText = getCompletionShortcutText();
+    if (completionShortcutText == null) {
+      return editor;
+    }
 
-  public String getAdvertisementText() {
-    return myAdText;
-  }
-
-  public void setVariants(@Nullable final List<LookupElement> variants) {
-    myVariants = (variants != null) ? variants : Collections.<LookupElement>emptyList();
-  }
-
-  public void setVariants(@Nullable final String[] variants) {
-    myVariants = (variants == null)
-       ? Collections.<LookupElement>emptyList()
-       : ContainerUtil.map(variants, new Function<String, LookupElement>() {
-      public LookupElement fun(final String s) {
-        return LookupElementBuilder.create(s);
+    final Ref<Boolean> toShowHintRef = new Ref<Boolean>(true);
+    editor.getDocument().addDocumentListener(new DocumentAdapter() {
+      @Override
+      public void documentChanged(DocumentEvent e) {
+        toShowHintRef.set(false);
       }
     });
+
+    editor.addFocusListener(new FocusChangeListener() {
+      @Override
+      public void focusGained(final Editor editor) {
+        if (toShowHintRef.get() && getText().length() == 0) {
+          ApplicationManager.getApplication().invokeLater(new Runnable() {
+            @Override
+            public void run() {
+              HintManager.getInstance().showInformationHint(editor, "Code completion available ( " + completionShortcutText + " )");
+            }
+          });
+        }
+      }
+
+      @Override
+      public void focusLost(Editor editor) {
+        // Do nothing
+      }
+    });
+    return editor;
   }
 
-  private LookupElement[] calcLookupItems(@Nullable final String lookupPrefix) {
-    if (lookupPrefix == null) {
-      return new LookupElement[0];
-    }
-
-    final List<LookupElement> items = new ArrayList<LookupElement>();
-    if (lookupPrefix.length() == 0) {
-      items.addAll(myVariants);
-    } else {
-      final Matcher matcher = NameUtil.buildMatcher(lookupPrefix, 0, true, true);
-
-      for (LookupElement variant : myVariants) {
-        if (matcher.matches(variant.getLookupString())) {
-          items.add(variant);
+  @Nullable
+  private static String getCompletionShortcutText() {
+    final AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_CODE_COMPLETION);
+    if (action != null) {
+      final ShortcutSet shortcutSet = action.getShortcutSet();
+      if (shortcutSet != null) {
+        final Shortcut[] shortcuts = shortcutSet.getShortcuts();
+        if (shortcuts != null && shortcuts.length > 0) {
+          return KeymapUtil.getShortcutText(shortcuts[0]);
         }
       }
     }
-
-    Collections.sort(items, myComparator);
-
-    return items.toArray(new LookupElement[items.size()]);
+    return null;
   }
 
-  public void setComparator(@NotNull Comparator<LookupElement> comparator) {
-    myComparator = comparator;
-  }
+  public static class StringsCompletionProvider extends TextFieldWithAutoCompletionListProvider<String> {
+    @Nullable private final Icon myIcon;
 
-  /**
-   * Returns prefix for autocompletion and lookup items matching.
-   */
-  @Nullable
-  protected String getCurrentLookupPrefix(final String currentTextPrefix) {
-    return currentTextPrefix;
-  }
+    public StringsCompletionProvider(@Nullable final Collection<String> variants,
+                                     @Nullable final Icon icon) {
+      super(variants);
+      myIcon = icon;
+    }
 
-  private String getCurrentTextPrefix() {
-    return getText().substring(0, getCaretModel().getOffset());
-  }
+    @Override
+    public int compare(final String item1, final String item2) {
+      return StringUtil.compare(item1, item2, false);
+    }
 
+    @Override
+    protected Icon getIcon(@NotNull final String item) {
+      return myIcon;
+    }
+
+    @NotNull
+    @Override
+    protected String getLookupString(@NotNull final String item) {
+      return item;
+    }
+
+    @Override
+    protected String getTailText(@NotNull final String item) {
+      return null;
+    }
+
+    @Override
+    protected String getTypeText(@NotNull String item) {
+      return null;
+    }
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java
new file mode 100644
index 000000000000..4544c0318a7d
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionContributor.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ui;
+
+import com.intellij.codeInsight.completion.*;
+import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.openapi.actionSystem.IdeActions;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Key;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Roman.Chernyatchik
+ */
+public class TextFieldWithAutoCompletionContributor<T> extends CompletionContributor {
+  private static final Key<TextFieldWithAutoCompletionListProvider> KEY = Key.create("text field simple completion available");
+  private static final Key<Boolean> AUTO_POPUP_KEY = Key.create("text Field simple completion auto-popup");
+
+  public static <T> void installCompletion(Document document,
+                                           Project project,
+                                           @Nullable TextFieldWithAutoCompletionListProvider<T> consumer,
+                                           boolean autoPopup) {
+    PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
+    if (psiFile != null) {
+      //noinspection unchecked
+      psiFile.putUserData(KEY, consumer == null ? TextFieldWithAutoCompletion.EMPTY_COMPLETION : consumer);
+      psiFile.putUserData(AUTO_POPUP_KEY, autoPopup);
+    }
+  }
+
+  @Override
+  public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
+    PsiFile file = parameters.getOriginalFile();
+    final TextFieldWithAutoCompletionListProvider<T> provider = file.getUserData(KEY);
+
+    if (provider != null) {
+      if (CompletionService.getCompletionService().getAdvertisementText() == null) {
+        String adv = provider.getAdvertisement();
+        if (adv == null) {
+          final String shortcut = getActionShortcut(IdeActions.ACTION_QUICK_JAVADOC);
+          if (shortcut != null) {
+            adv = provider.getQuickDocHotKeyAdvertisement(shortcut);
+          }
+        }
+        if (adv != null) {
+          CompletionService.getCompletionService().setAdvertisementText(adv);
+        }
+      }
+
+      final String prefix = provider.getPrefix(parameters);
+      if (prefix == null) {
+        return;
+      }
+      if (parameters.getInvocationCount() == 0 && !file.getUserData(AUTO_POPUP_KEY)) {   // is autopopup
+        return;
+      }
+      final PrefixMatcher prefixMatcher = provider.createPrefixMatcher(prefix);
+      if (prefixMatcher != null) {
+        result = result.withPrefixMatcher(prefixMatcher);
+      }
+
+      Collection<T> items = provider.getItems(prefix, true);
+      addCompletionElements(result, provider, items, -10000);
+
+      Future<Collection<T>>
+        future =
+        ApplicationManager.getApplication().executeOnPooledThread(new Callable<Collection<T>>() {
+          @Override
+          public Collection<T> call() {
+            return provider.getItems(prefix, false);
+          }
+        });
+
+      while (true) {
+        try {
+          Collection<T> tasks = future.get(100, TimeUnit.MILLISECONDS);
+          if (tasks != null) {
+            addCompletionElements(result, provider, tasks, 0);
+            return;
+          }
+        }
+        catch (ProcessCanceledException e) {
+          throw e;
+        }
+        catch (Exception ignore) {
+
+        }
+        ProgressManager.checkCanceled();
+      }
+    }
+  }
+
+  private static <T> void addCompletionElements(final CompletionResultSet result,
+                                                final TextFieldWithAutoCompletionListProvider<T> listProvider,
+                                                final Collection<T> items,
+                                                final int index) {
+    final AutoCompletionPolicy completionPolicy = ApplicationManager.getApplication().isUnitTestMode()
+                                                  ? AutoCompletionPolicy.ALWAYS_AUTOCOMPLETE
+                                                  : AutoCompletionPolicy.NEVER_AUTOCOMPLETE;
+    int grouping = index;
+    for (final T item : items) {
+      LookupElementBuilder builder = listProvider.createLookupBuilder(item);
+
+      result.addElement(PrioritizedLookupElement.withGrouping(builder.withAutoCompletionPolicy(completionPolicy), grouping--));
+    }
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java
new file mode 100644
index 000000000000..e83151872499
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ui;
+
+import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.InsertHandler;
+import com.intellij.codeInsight.completion.PlainPrefixMatcher;
+import com.intellij.codeInsight.completion.PrefixMatcher;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.util.*;
+
+/**
+ * @author Roman.Chernyatchik
+ */
+public abstract class TextFieldWithAutoCompletionListProvider<T> implements Comparator<T> {
+  @NotNull
+  private Collection<T> myVariants;
+  @Nullable
+  private String myCompletionAdvertisement;
+
+  @Nullable
+  protected abstract Icon getIcon(@NotNull final T item);
+
+  @NotNull
+  protected abstract String getLookupString(@NotNull final T item);
+
+  @Nullable
+  protected abstract String getTailText(@NotNull final T item);
+
+  @Nullable
+  protected abstract String getTypeText(@NotNull final T item);
+
+  public abstract int compare(T item1, T item2);
+
+  protected TextFieldWithAutoCompletionListProvider(@Nullable final Collection<T> variants) {
+    setItems(variants);
+    myCompletionAdvertisement = null;
+  }
+
+  public void setItems(@Nullable final Collection<T> variants) {
+    myVariants = (variants != null) ? variants : Collections.<T>emptyList();
+  }
+
+  @NotNull
+  public List<T> getItems(String prefix, boolean cached) {
+    if (prefix == null) {
+      return Collections.emptyList();
+    }
+
+    final List<T> items = new ArrayList<T>(myVariants);
+
+    Collections.sort(items, this);
+    return items;
+  }
+
+  /**
+   * Completion list advertisement for documentation popup
+   *
+   * @param shortcut
+   * @return text
+   */
+  @Nullable
+  public String getQuickDocHotKeyAdvertisement(@NotNull final String shortcut) {
+    final String advertisementTail = getQuickDocHotKeyAdvertisementTail(shortcut);
+    if (advertisementTail == null) {
+      return null;
+    }
+    return "Pressing " + shortcut + " would show " + advertisementTail;
+  }
+
+  /**
+   * Completion list advertisement text, if null advertisement for documentation
+   * popup will be shown
+   *
+   * @return text
+   */
+  @Nullable
+  public String getAdvertisement() {
+    return myCompletionAdvertisement;
+  }
+
+  public void setAdvertisement(@Nullable final String completionAdvertisement) {
+    myCompletionAdvertisement = completionAdvertisement;
+  }
+
+  @Nullable
+  public PrefixMatcher createPrefixMatcher(@NotNull final String prefix) {
+    return new PlainPrefixMatcher(prefix);
+  }
+
+  public LookupElementBuilder createLookupBuilder(@NotNull final T item) {
+    LookupElementBuilder builder = LookupElementBuilder.create(item, getLookupString(item))
+      .setIcon(getIcon(item));
+
+    final InsertHandler<LookupElement> handler = createInsertHandler(item);
+    if (handler != null) {
+      builder = builder.setInsertHandler(handler);
+    }
+
+    final String tailText = getTailText(item);
+    if (tailText != null) {
+      builder = builder.setTailText(tailText, true);
+    }
+
+    final String typeText = getTypeText(item);
+    if (typeText != null) {
+      builder = builder.setTypeText(typeText);
+    }
+    return builder;
+  }
+
+  @Nullable
+  public String getPrefix(@NotNull final CompletionParameters parameters) {
+    String text = parameters.getOriginalFile().getText();
+    int i = text.lastIndexOf(' ', parameters.getOffset() - 1) + 1;
+    return text.substring(i, parameters.getOffset());
+  }
+
+  @Nullable
+  protected String getQuickDocHotKeyAdvertisementTail(@NotNull final String shortcut) {
+    return null;
+  }
+
+  @Nullable
+  protected InsertHandler<LookupElement> createInsertHandler(@NotNull final T item) {
+    return null;
+  }
+}
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 0b87b66a01b1..0ca66b9dc425 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -63,7 +63,7 @@
   <applicationService serviceInterface="com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings"
                       serviceImplementation="com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings"/>
   <exportable serviceInterface="com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings"/>
-  
+
   <applicationService serviceInterface="com.intellij.facet.FacetTypeRegistry"
                       serviceImplementation="com.intellij.facet.impl.FacetTypeRegistryImpl"/>
 
@@ -122,7 +122,7 @@
 
   <applicationService serviceInterface="com.intellij.ui.IconDeferrer"
                       serviceImplementation="com.intellij.ui.IconDeferrerImpl"/>
-  
+
   <applicationService serviceInterface="com.intellij.ui.mac.MacMessages"
                       serviceImplementation="com.intellij.ui.mac.MacMessagesImpl"/>
 
@@ -145,7 +145,7 @@
                       serviceImplementation="com.intellij.util.download.impl.DownloadableFileServiceImpl"/>
 
   <applicationService serviceInterface="com.intellij.psi.impl.DocumentCommitThread"
-      serviceImplementation="com.intellij.psi.impl.DocumentCommitThread"/>
+                      serviceImplementation="com.intellij.psi.impl.DocumentCommitThread"/>
 
   <applicationService serviceInterface="com.intellij.psi.stubs.StubTreeLoader"
                       serviceImplementation="com.intellij.psi.stubs.StubTreeLoaderImpl"/>
@@ -241,7 +241,7 @@
                   serviceImplementation="com.intellij.analysis.AnalysisUIOptions"/>
 
   <projectService serviceInterface="com.intellij.ide.util.gotoByName.ChooseByNameFactory"
-                  serviceImplementation="com.intellij.ide.util.gotoByName.ChooseByNameFactoryImpl"/>  
+                  serviceImplementation="com.intellij.ide.util.gotoByName.ChooseByNameFactoryImpl"/>
 
   <projectService serviceInterface="com.intellij.refactoring.listeners.RefactoringListenerManager"
                   serviceImplementation="com.intellij.refactoring.listeners.impl.RefactoringListenerManagerImpl"/>
@@ -256,7 +256,7 @@
                   serviceImplementation="com.intellij.diagnostic.logging.LogConsolePreferences"/>
 
   <applicationService serviceInterface="com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry"
-                  serviceImplementation="com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistryImpl"/>
+                      serviceImplementation="com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistryImpl"/>
 
   <projectService serviceInterface="com.intellij.find.FindManager"
                   serviceImplementation="com.intellij.find.impl.FindManagerImpl"/>
@@ -317,7 +317,7 @@
 
   <!--
     -->
-<!-- Code Completion -->
+  <!-- Code Completion -->
 
 
   <!-- Global Code Style -->
@@ -390,67 +390,92 @@
   <internalFileTemplate name="Html"/>
   <internalFileTemplate name="Html5"/>
   <internalFileTemplate name="Xhtml"/>
-  <fileBasedIndex implementation="com.intellij.psi.impl.cache.impl.todo.TodoIndex" />
-  <fileBasedIndex implementation="com.intellij.psi.impl.cache.impl.id.IdIndex" />
+  <fileBasedIndex implementation="com.intellij.psi.impl.cache.impl.todo.TodoIndex"/>
+  <fileBasedIndex implementation="com.intellij.psi.impl.cache.impl.id.IdIndex"/>
   <fileBasedIndex implementation="com.intellij.psi.search.FilenameIndex"/>
   <fileBasedIndex implementation="com.intellij.psi.search.FileTypeIndex"/>
   <fileBasedIndex implementation="com.intellij.psi.stubs.StubUpdatingIndex"/>
 
-  <fileBasedIndex implementation="com.intellij.find.ngrams.TrigramIndex"/> 
+  <fileBasedIndex implementation="com.intellij.find.ngrams.TrigramIndex"/>
 
   <fileBasedIndex implementation="com.intellij.psi.impl.include.FileIncludeIndex"/>
 
   <syntaxHighlighter factoryClass="com.intellij.openapi.fileTypes.LanguageFileTypeHighlighterProvider"/>
   <structureViewBuilder factoryClass="com.intellij.ide.highlighter.LanguageFileTypeStructureViewBuilderProvider"/>
 
-  <lang.elementManipulator forClass="com.intellij.psi.PsiPlainTextFile" implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.PlainFileManipulator"/>
-  <lang.elementManipulator forClass="com.intellij.psi.PsiComment" implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.PsiCommentManipulator"/>
+  <lang.elementManipulator forClass="com.intellij.psi.PsiPlainTextFile"
+                           implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.PlainFileManipulator"/>
+  <lang.elementManipulator forClass="com.intellij.psi.PsiComment"
+                           implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.PsiCommentManipulator"/>
 
   <applicationService serviceInterface="com.intellij.ide.macro.MacroManager" serviceImplementation="com.intellij.ide.macro.MacroManager"/>
-  <hectorComponentProvider implementation="com.intellij.codeInsight.daemon.impl.FileIncludeContextHectorProvider" />
+  <hectorComponentProvider implementation="com.intellij.codeInsight.daemon.impl.FileIncludeContextHectorProvider"/>
 
   <programRunner implementation="com.intellij.tools.ToolProgramRunner"/>
 
   <ideRootPaneNorth implementation="com.intellij.ide.navigationToolbar.NavBarRootPaneExtension"/>
   <navbar implementation="com.intellij.ide.navigationToolbar.DefaultNavBarExtension" id="defaultNavbar"/>
 
-  <statistician key="completion" implementationClass="com.intellij.codeInsight.completion.DecoratorCompletionStatistician" order="first" id="decorator"/>
+  <statistician key="completion" implementationClass="com.intellij.codeInsight.completion.DecoratorCompletionStatistician" order="first"
+                id="decorator"/>
   <statistician key="completion" implementationClass="com.intellij.codeInsight.completion.DefaultCompletionStatistician" order="last"/>
 
   <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.OpenedInEditorWeigher" id="openedInEditor"/>
-  <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SameLogicalRootWeigher" id="sameLogicalRoot" order="after openedInEditor"/>
-  <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SameModuleWeigher" id="sameModule" order="after sameLogicalRoot"/>
-  <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SdkOrLibraryWeigher" id="sdkOrLibrary" order="after sameModule"/>
+  <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SameLogicalRootWeigher" id="sameLogicalRoot"
+           order="after openedInEditor"/>
+  <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SameModuleWeigher" id="sameModule"
+           order="after sameLogicalRoot"/>
+  <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SdkOrLibraryWeigher" id="sdkOrLibrary"
+           order="after sameModule"/>
 
   <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PriorityWeigher" id="priority" order="first"/>
-  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.NegativeStatisticsWeigher" id="negativeStats" order="first, after priority"/>
-  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.StatisticsWeigher" id="stats" order="after negativeStats"/>
-  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PrefixMatchingWeigher" id="prefix" order="after stats"/>
-  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.LookupElementProximityWeigher" id="proximity" order="after prefix"/>
+  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.NegativeStatisticsWeigher" id="negativeStats"
+           order="first, after priority"/>
+  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.StatisticsWeigher" id="stats"
+           order="after negativeStats"/>
+  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PrefixMatchingWeigher" id="prefix"
+           order="after stats"/>
+  <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.LookupElementProximityWeigher" id="proximity"
+           order="after prefix"/>
 
-  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.PriorityWeigher$Negative" id="sPriority" order="first"/>
-  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.GroupingWeigher" id="sGrouping" order="after sPriority"/>
-  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.LookupStringWeigher" id="sLookupString" order="after sGrouping"/>
-  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.LookupElementProximityWeigher$Negative" id="sProximity" order="after sLookupString"/>
+  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.PriorityWeigher$Negative" id="sPriority"
+           order="first"/>
+  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.GroupingWeigher" id="sGrouping"
+           order="after sPriority"/>
+  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.LookupStringWeigher" id="sLookupString"
+           order="after sGrouping"/>
+  <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.LookupElementProximityWeigher$Negative"
+           id="sProximity" order="after sLookupString"/>
 
-  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.DefaultCompletionContributor" id="default" order="last"/>
-  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.ComboEditorCompletionContributor" id="comboEditor" order="first"/>
-  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.WordCompletionContributor" id="wordCompletion" order="last"/>
-  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.LegacyCompletionContributor" id="legacy" order="last"/>
-  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.FilePathCompletionContributor" id="filePath" order="before javaClassName"/>
-  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor" id="liveTemplates" order="first"/>
+  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.DefaultCompletionContributor" id="default"
+                          order="last"/>
+  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.ComboEditorCompletionContributor"
+                          id="comboEditor" order="first"/>
+  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.WordCompletionContributor"
+                          id="wordCompletion" order="last"/>
+  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.LegacyCompletionContributor" id="legacy"
+                          order="last"/>
+  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.FilePathCompletionContributor"
+                          id="filePath" order="before javaClassName"/>
+  <completion.contributor language="any" implementationClass="com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor"
+                          id="liveTemplates" order="first"/>
 
   <completion.skip implementation="com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor$Skipper" id="skipLiveTemplate"/>
 
-  <completion.contributor language="TEXT" implementationClass="com.intellij.openapi.vcs.CommitCompletionContributor" id="commitCompletion" order="first, before liveTemplates"/>
+  <completion.contributor language="TEXT" implementationClass="com.intellij.openapi.vcs.CommitCompletionContributor" id="commitCompletion"
+                          order="first, before liveTemplates"/>
+  <completion.contributor language="JAVA" implementationClass="com.intellij.codeInspection.magicConstant.MagicCompletionContributor"
+                          id="magicCompletion" order="first, before liveTemplates"/>
 
-  <applicationService serviceInterface="com.intellij.execution.console.ConsoleFoldingSettings" serviceImplementation="com.intellij.execution.console.ConsoleFoldingSettings"/>
+  <applicationService serviceInterface="com.intellij.execution.console.ConsoleFoldingSettings"
+                      serviceImplementation="com.intellij.execution.console.ConsoleFoldingSettings"/>
   <console.folding implementation="com.intellij.execution.console.SubstringConsoleFolding"/>
 
   <lookup.charFilter implementation="com.intellij.codeInsight.template.impl.LiveTemplateCharFilter" order="first" id="liveTemplate"/>
   <lookup.charFilter implementation="com.intellij.codeInsight.completion.CompletionCharFilter" order="last" id="completion"/>
   <lookup.charFilter implementation="com.intellij.refactoring.IdentifierCharFilter" id="identifier"/>
-  <lookup.charFilter implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceCharFilter" id="fileRef" order="before completion"/>
+  <lookup.charFilter implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceCharFilter" id="fileRef"
+                     order="before completion"/>
 
   <gotoFileContributor implementation="com.intellij.ide.util.gotoByName.DefaultFileNavigationContributor"/>
   <gotoRelatedProvider implementation="com.intellij.ide.actions.RelatedItemLineMarkerGotoAdapter"/>
@@ -468,8 +493,10 @@
   <usageFilteringRuleProvider implementation="com.intellij.usages.impl.UsageFilteringRuleProviderImpl"/>
   <usageGroupingRuleProvider implementation="com.intellij.usages.impl.UsageGroupingRuleProviderImpl"/>
 
-  <projectService serviceInterface="com.intellij.psi.templateLanguages.TemplateDataLanguageMappings" serviceImplementation="com.intellij.psi.templateLanguages.TemplateDataLanguageMappings"/>
-  <applicationService serviceInterface="com.intellij.psi.templateLanguages.TemplateDataLanguagePatterns" serviceImplementation="com.intellij.psi.templateLanguages.TemplateDataLanguagePatterns"/>
+  <projectService serviceInterface="com.intellij.psi.templateLanguages.TemplateDataLanguageMappings"
+                  serviceImplementation="com.intellij.psi.templateLanguages.TemplateDataLanguageMappings"/>
+  <applicationService serviceInterface="com.intellij.psi.templateLanguages.TemplateDataLanguagePatterns"
+                      serviceImplementation="com.intellij.psi.templateLanguages.TemplateDataLanguagePatterns"/>
 
   <!-- execution -->
   <executor implementation="com.intellij.execution.executors.DefaultRunExecutor" order="first" id="run"/>
@@ -487,7 +514,8 @@
   <syntaxHighlighter factoryClass="com.intellij.ide.highlighter.custom.impl.CustomFileTypeHighlighterProvider"/>
   <fileTypeRegistrator implementation="com.intellij.ide.highlighter.custom.impl.StandardFileTypeRegistrator"/>
 
-  <directoryProjectConfigurator implementation="com.intellij.platform.PlatformProjectConfigurator" order="first" id="PlatformProjectConfigurator"/>
+  <directoryProjectConfigurator implementation="com.intellij.platform.PlatformProjectConfigurator" order="first"
+                                id="PlatformProjectConfigurator"/>
   <directoryProjectConfigurator implementation="com.intellij.platform.PlatformProjectViewOpener"/>
 
   <iconProvider implementation="com.intellij.psi.impl.file.DirectoryIconProvider" id="directory" order="last"/>
@@ -497,7 +525,8 @@
   <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterInStringLiteralHandler"/>
   <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterInLineCommentHandler"/>
   <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler"/>
-  <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesHandler" id="EnterBetweenBracesHandler"/>
+  <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesHandler"
+                        id="EnterBetweenBracesHandler"/>
   <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterAfterJavadocTagHandler"/>
 
   <codeInsight.linkHandler prefix="#inspection/" handlerClass="com.intellij.codeInsight.hint.InspectionDescriptionLinkHandler"/>
@@ -533,14 +562,16 @@
   <editorActionHandler action="EditorCut" implementationClass="com.intellij.codeInsight.editorActions.CutHandler"/>
   <editorActionHandler action="EditorJoinLines" implementationClass="com.intellij.codeInsight.editorActions.JoinLinesHandler"/>
   <editorActionHandler action="EditorBackSpace" implementationClass="com.intellij.codeInsight.editorActions.BackspaceHandler"/>
-  <editorActionHandler action="EditorDeleteToWordStart" implementationClass="com.intellij.codeInsight.editorActions.BackspaceToWordStartHandler"/>
+  <editorActionHandler action="EditorDeleteToWordStart"
+                       implementationClass="com.intellij.codeInsight.editorActions.BackspaceToWordStartHandler"/>
   <editorTypedHandler implementationClass="com.intellij.codeInsight.editorActions.TypedHandler"/>
 
   <!-- LookupManagerActions -->
   <editorActionHandler action="EditorUp" implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$UpHandler"/>
   <editorActionHandler action="EditorDown" implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$DownHandler"/>
   <editorActionHandler action="EditorPageUp" implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$PageUpHandler"/>
-  <editorActionHandler action="EditorPageDown" implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$PageDownHandler"/>
+  <editorActionHandler action="EditorPageDown"
+                       implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$PageDownHandler"/>
   <editorActionHandler action="EditorLeft" implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$LeftHandler"/>
   <editorActionHandler action="EditorRight" implementationClass="com.intellij.codeInsight.lookup.impl.LookupActionHandler$RightHandler"/>
   <editorActionHandler action="EditorLineStart" implementationClass="com.intellij.codeInsight.lookup.impl.HomeHandler"/>
@@ -549,17 +580,22 @@
 
   <!-- TemplateManagerActions -->
   <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.template.impl.editorActions.EscapeHandler"/>
-  <editorActionHandler action="EditorEnter" implementationClass="com.intellij.codeInsight.template.impl.editorActions.EnterHandler" id="templateEnter" order="before editorEnter"/>
+  <editorActionHandler action="EditorEnter" implementationClass="com.intellij.codeInsight.template.impl.editorActions.EnterHandler"
+                       id="templateEnter" order="before editorEnter"/>
   <editorActionHandler action="EditorLineStart" implementationClass="com.intellij.codeInsight.template.impl.editorActions.HomeHandler"/>
-  <editorActionHandler action="EditorLineStartWithSelection" implementationClass="com.intellij.codeInsight.template.impl.editorActions.LineStartWithSelectionHandler"/>
+  <editorActionHandler action="EditorLineStartWithSelection"
+                       implementationClass="com.intellij.codeInsight.template.impl.editorActions.LineStartWithSelectionHandler"/>
   <editorActionHandler action="EditorLineEnd" implementationClass="com.intellij.codeInsight.template.impl.editorActions.EndHandler"/>
-  <editorActionHandler action="EditorLineEndWithSelection" implementationClass="com.intellij.codeInsight.template.impl.editorActions.LineEndWithSelectionHandler"/>
+  <editorActionHandler action="EditorLineEndWithSelection"
+                       implementationClass="com.intellij.codeInsight.template.impl.editorActions.LineEndWithSelectionHandler"/>
   <editorActionHandler action="$SelectAll" implementationClass="com.intellij.codeInsight.template.impl.editorActions.SelectAllHandler"/>
   <editorTypedHandler implementationClass="com.intellij.codeInsight.template.impl.editorActions.SpaceHandler"/>
 
   <!-- HighlightManagerActions -->
-  <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.highlighting.EscapeHandler" order="after hide-hints"/>
-  <editorActionHandler action="EditorEscape" implementationClass="com.intellij.refactoring.rename.inplace.EscapeHandler" order="before hide-hints"/>
+  <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.highlighting.EscapeHandler"
+                       order="after hide-hints"/>
+  <editorActionHandler action="EditorEscape" implementationClass="com.intellij.refactoring.rename.inplace.EscapeHandler"
+                       order="before hide-hints"/>
 
   <typedHandler implementation="com.intellij.codeInsight.lookup.impl.LookupTypedHandler" id="lookup" order="first"/>
   <typedHandler implementation="com.intellij.codeInsight.editorActions.CompletionAutoPopupHandler" id="completionAutoPopup" order="first"/>
@@ -620,7 +656,7 @@
   <toolWindow id="Structure" anchor="left" icon="/general/toolWindowStructure.png" secondary="true"
               factoryClass="com.intellij.ide.structureView.impl.StructureViewToolWindowFactory"/>
   <toolWindow id="Favorites" anchor="left" icon="/general/toolWindowFavorites.png" secondary="true"
-                factoryClass="com.intellij.ide.projectView.impl.FavoritesViewToolWindowFactory"/>
+              factoryClass="com.intellij.ide.projectView.impl.FavoritesViewToolWindowFactory"/>
 
   <psi.fileReferenceHelper implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.PsiFileReferenceHelper"/>
   <psi.fileReferenceHelper implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.JarFileReferenceHelper"/>
@@ -652,7 +688,8 @@
   <fileIconProvider implementation="com.intellij.ide.FileIconPatcherImpl"/>
   <renameHandler implementation="com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler"/>
   <renameHandler implementation="com.intellij.refactoring.rename.inplace.MemberInplaceRenameHandler"/>
-  <completion.contributor language="any" implementationClass="com.intellij.refactoring.rename.inplace.CompletionContributorForInplaceRename" order="first, before liveTemplates"/>
+  <completion.contributor language="any" implementationClass="com.intellij.refactoring.rename.inplace.CompletionContributorForInplaceRename"
+                          order="first"/>
 
   <projectService serviceInterface="com.intellij.openapi.vcs.changes.ui.ChangesFileNameDecorator"
                   serviceImplementation="com.intellij.openapi.vcs.changes.ui.WolfChangesFileNameDecorator"/>
@@ -669,8 +706,8 @@
 
   <copyPastePostProcessor implementation="com.intellij.codeInsight.editorActions.CopyPasteIndentProcessor"/>
 
-  <statistics.usagesCollector  implementation="com.intellij.facet.impl.statistics.FrameworkUsagesCollector"/>
-  <statistics.usagesCollector  implementation="com.intellij.facet.impl.statistics.ModuleTypeUsagesCollector"/>
+  <statistics.usagesCollector implementation="com.intellij.facet.impl.statistics.FrameworkUsagesCollector"/>
+  <statistics.usagesCollector implementation="com.intellij.facet.impl.statistics.ModuleTypeUsagesCollector"/>
   <statistics.usagesCollector implementation="com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesCollector"/>
   <statistics.usagesCollector implementation="com.intellij.execution.impl.statistics.TemporaryRunConfigurationTypeUsagesCollector"/>
   <statistics.usagesCollector implementation="com.intellij.openapi.fileTypes.FileTypeUsagesCollector"/>
@@ -682,11 +719,12 @@
 
   <keymapExtension implementation="com.intellij.tools.ToolKeymapExtension"/>
 
-  <inspectionsReportConverter implementation="com.intellij.codeInspection.ex.PlainTextFormatter" />
+  <inspectionsReportConverter implementation="com.intellij.codeInspection.ex.PlainTextFormatter"/>
 
   <documentationProvider implementation="com.intellij.openapi.paths.WebReferenceDocumentationProvider"/>
 
-  <refactoring.moveDirectoryWithClassesHelper implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesHelper$Default" order="last"/>
+  <refactoring.moveDirectoryWithClassesHelper
+      implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesHelper$Default" order="last"/>
 
   <checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.ReformatCheckinHandlerFactory"/>
   <checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.OptimizeOptionsCheckinHandlerFactory"/>
@@ -709,4 +747,7 @@
 
   <customFoldingProvider implementation="com.intellij.lang.customFolding.NetBeansCustomFoldingProvider"/>
   <customFoldingProvider implementation="com.intellij.lang.customFolding.VisualStudioCustomFoldingProvider"/>
+
+  <completion.contributor language="TEXT" implementationClass="com.intellij.ui.TextFieldWithAutoCompletionContributor"
+                          order="first, before commitCompletion"/>
 </extensions>
diff --git a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
index d93d519ba1fd..e7f3904d6022 100644
--- a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
+++ b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
@@ -1,18 +1,7 @@
 package org.jetbrains.android.logcat;
 
 import com.android.ddmlib.Log;
-import com.intellij.codeInsight.hint.HintManager;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.ide.ui.ListCellRendererWrapper;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.event.DocumentAdapter;
-import com.intellij.openapi.editor.event.DocumentEvent;
-import com.intellij.openapi.editor.ex.EditorEx;
-import com.intellij.openapi.editor.ex.FocusChangeListener;
-import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ValidationInfo;
@@ -28,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.Arrays;
-import java.util.Comparator;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -62,34 +51,37 @@ class EditLogFilterDialog extends DialogWrapper {
 
     myView = view;
 
-    myTagField = new MyTextFieldWithAutoCompletion(view.getProject()) {
+    final Project project = view.getProject();
+
+    myTagField = new TextFieldWithAutoCompletion<String>(project, new TextFieldWithAutoCompletion.StringsCompletionProvider(null, null) {
+      @NotNull
       @Override
-      public void showLookup() {
+      public List<String> getItems(String prefix, boolean cached) {
         parseExistingMessagesIfNecessary();
-        myTagField.setVariants(Arrays.asList(toLookupElements(myUsedTags)));
-        super.showLookup();
+        setItems(Arrays.asList(myUsedTags));
+        return super.getItems(prefix, cached);
       }
-    };
+    }, true);
 
     myTagFieldWrapper.add(myTagField);
     myLogTagLabel.setLabelFor(myTagField);
 
-    myPidField = new MyTextFieldWithAutoCompletion(view.getProject()) {
+    myPidField = new TextFieldWithAutoCompletion<String>(project, new TextFieldWithAutoCompletion.StringsCompletionProvider(null, null) {
+      @NotNull
       @Override
-      public void showLookup() {
+      public List<String> getItems(String prefix, boolean cached) {
         parseExistingMessagesIfNecessary();
-        myPidField.setVariants(myUsedPids);
-        super.showLookup();
+        setItems(Arrays.asList(myUsedPids));
+        return super.getItems(prefix, cached);
       }
-    };
-    myPidField.setComparator(new Comparator<LookupElement>() {
+
       @Override
-      public int compare(LookupElement e1, LookupElement e2) {
-        final int pid1 = Integer.parseInt(e1.getLookupString());
-        final int pid2 = Integer.parseInt(e2.getLookupString());
+      public int compare(String item1, String item2) {
+        final int pid1 = Integer.parseInt(item1);
+        final int pid2 = Integer.parseInt(item2);
         return Comparing.compare(pid1, pid2);
       }
-    });
+    }, true);
     myPidFieldWrapper.add(myPidField);
 
     myLogLevelCombo.setModel(new EnumComboBoxModel<Log.LogLevel>(Log.LogLevel.class));
@@ -113,31 +105,6 @@ class EditLogFilterDialog extends DialogWrapper {
     }
   }
 
-  @Nullable
-  private static String getCompletionShortcutText() {
-    final AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_CODE_COMPLETION);
-    if (action != null) {
-      final ShortcutSet shortcutSet = action.getShortcutSet();
-      if (shortcutSet != null) {
-        final Shortcut[] shortcuts = shortcutSet.getShortcuts();
-        if (shortcuts != null && shortcuts.length > 0) {
-          return KeymapUtil.getShortcutText(shortcuts[0]);
-        }
-      }
-    }
-    return null;
-  }
-  
-  private static LookupElement[] toLookupElements(@NotNull String[] strs) {
-    final LookupElement[] result = new LookupElement[strs.length];
-    
-    for (int i = 0; i < result.length; i++) {
-      final String s = strs[i];
-      result[i] = LookupElementBuilder.create(s).addLookupString(s.toLowerCase());
-    }
-    return result;
-  }
-
   private void parseExistingMessagesIfNecessary() {
     if (myExistingMessagesParsed) {
       return;
@@ -218,7 +185,7 @@ class EditLogFilterDialog extends DialogWrapper {
   @Override
   protected ValidationInfo doValidate() {
     final String name = myNameField.getText().trim();
-    
+
     if (name.length() == 0) {
       return new ValidationInfo(AndroidBundle.message("android.logcat.new.filter.dialog.name.not.specified.error"), myNameField);
     }
@@ -279,51 +246,4 @@ class EditLogFilterDialog extends DialogWrapper {
   public AndroidConfiguredLogFilters.MyFilterEntry getCustomLogFiltersEntry() {
     return myEntry;
   }
-
-  private static class MyTextFieldWithAutoCompletion extends TextFieldWithAutoCompletion {
-    private boolean myToShowHint;
-    private final String myCompletionShortcutText;
-
-    public MyTextFieldWithAutoCompletion(Project project) {
-      super(project);
-      myCompletionShortcutText = getCompletionShortcutText();
-      myToShowHint = true;
-    }
-
-    @Override
-    protected EditorEx createEditor() {
-      final EditorEx editor = super.createEditor();
-
-      if (myCompletionShortcutText == null) {
-        return editor;
-      }
-
-      editor.getDocument().addDocumentListener(new DocumentAdapter() {
-        @Override
-        public void documentChanged(DocumentEvent e) {
-          myToShowHint = false;
-        }
-      });
-
-      editor.addFocusListener(new FocusChangeListener() {
-        @Override
-        public void focusGained(final Editor editor) {
-          if (myToShowHint && getText().length() == 0) {
-            ApplicationManager.getApplication().invokeLater(new Runnable() {
-              @Override
-              public void run() {
-                HintManager.getInstance().showInformationHint(editor, "Code completion available (" + myCompletionShortcutText + ")");
-              }
-            });
-          }
-        }
-
-        @Override
-        public void focusLost(Editor editor) {
-        }
-      });
-
-      return editor;
-    }
-  }
 }
diff --git a/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.java b/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.java
index 8af37b973bb4..f978d1da683e 100644
--- a/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.java
+++ b/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.java
@@ -27,6 +27,7 @@ import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -42,7 +43,8 @@ public class HtmlLanguageLevelForm {
   private List<MyListener> myListeners = new ArrayList<MyListener>();
 
   public HtmlLanguageLevelForm(Project project) {
-    myDoctypeTextField = new TextFieldWithAutoCompletion(project);
+    final String[] urls = ExternalResourceManager.getInstance().getResourceUrls(null, true);
+    myDoctypeTextField = TextFieldWithAutoCompletion.create(project, Arrays.asList(urls), null, true);
     myOtherDoctypeWrapper.add(myDoctypeTextField);
     ActionListener listener = new ActionListener() {
       @Override
@@ -60,7 +62,6 @@ public class HtmlLanguageLevelForm {
         fireDoctypeChanged();
       }
     });
-    myDoctypeTextField.setVariants(ExternalResourceManager.getInstance().getResourceUrls(null, true));
   }
 
   public JPanel getContentPanel() {

From f9d0880ba5665e90e2c578328897e0d9e5f5c934 Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Mon, 13 Feb 2012 10:19:16 +0400
Subject: [PATCH 22/26] tasks list field refactored with text field with
 autocompletion

---
 .../ui/TextFieldWithAutoCompletion.java       |   2 +-
 ...xtFieldWithAutoCompletionListProvider.java |   2 +-
 .../android/logcat/EditLogFilterDialog.java   |   6 +-
 .../tasks/tasks-core/src/META-INF/plugin.xml  |   6 +-
 .../tasks/actions/ActivateTaskDialog.java     | 137 ++++++++++++++----
 .../tasks/impl/TaskChangelistSupport.java     |  11 +-
 .../tasks/impl/TaskCompletionContributor.java | 124 ----------------
 .../intellij/tasks/TaskCompletionTest.java    |  10 +-
 8 files changed, 133 insertions(+), 165 deletions(-)
 delete mode 100644 plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java

diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
index 8c256ddf9e0f..0b2fcc817fda 100644
--- a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
+++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
@@ -162,7 +162,7 @@ public class TextFieldWithAutoCompletion<T> extends LanguageTextField {
     }
 
     @Override
-    protected String getTypeText(@NotNull String item) {
+    protected String getTypeText(@NotNull final String item) {
       return null;
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java
index e83151872499..22a57a83dc0d 100644
--- a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java
+++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java
@@ -60,7 +60,7 @@ public abstract class TextFieldWithAutoCompletionListProvider<T> implements Comp
   }
 
   @NotNull
-  public List<T> getItems(String prefix, boolean cached) {
+  public Collection<T> getItems(String prefix, boolean cached) {
     if (prefix == null) {
       return Collections.emptyList();
     }
diff --git a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
index e7f3904d6022..939aea4cdc24 100644
--- a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
+++ b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -56,7 +56,7 @@ class EditLogFilterDialog extends DialogWrapper {
     myTagField = new TextFieldWithAutoCompletion<String>(project, new TextFieldWithAutoCompletion.StringsCompletionProvider(null, null) {
       @NotNull
       @Override
-      public List<String> getItems(String prefix, boolean cached) {
+      public Collection<String> getItems(String prefix, boolean cached) {
         parseExistingMessagesIfNecessary();
         setItems(Arrays.asList(myUsedTags));
         return super.getItems(prefix, cached);
@@ -69,7 +69,7 @@ class EditLogFilterDialog extends DialogWrapper {
     myPidField = new TextFieldWithAutoCompletion<String>(project, new TextFieldWithAutoCompletion.StringsCompletionProvider(null, null) {
       @NotNull
       @Override
-      public List<String> getItems(String prefix, boolean cached) {
+      public Collection<String> getItems(String prefix, boolean cached) {
         parseExistingMessagesIfNecessary();
         setItems(Arrays.asList(myUsedPids));
         return super.getItems(prefix, cached);
diff --git a/plugins/tasks/tasks-core/src/META-INF/plugin.xml b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
index 7b6f530957b2..639464f593c2 100644
--- a/plugins/tasks/tasks-core/src/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
@@ -29,7 +29,7 @@
       </action>
       <separator/>
       <action id="tasks.create.changelist" class="com.intellij.tasks.actions.CreateChangelistAction" text="Create Change_list..."/>
-      <action id="tasks.show.task.description" class="com.intellij.tasks.actions.ShowTaskDescription" text="Show Description" />
+      <action id="tasks.show.task.description" class="com.intellij.tasks.actions.ShowTaskDescription" text="Show Description"/>
       <action id="tasks.open.in.browser" class="com.intellij.tasks.actions.OpenTaskInBrowserAction" text="Open in _Browser">
         <keyboard-shortcut keymap="$default" first-keystroke="alt shift B"/>
       </action>
@@ -90,14 +90,12 @@
 
     <editChangelistSupport implementation="com.intellij.tasks.impl.TaskChangelistSupport"/>
 
-    <completion.contributor language="TEXT" implementationClass="com.intellij.tasks.impl.TaskCompletionContributor" order="first, before commitCompletion"/>
-
     <projectService serviceInterface="com.intellij.tasks.impl.TaskProjectConfiguration"
                     serviceImplementation="com.intellij.tasks.impl.TaskProjectConfiguration"/>
     <projectService serviceInterface="com.intellij.tasks.context.WorkingContextManager"
                     serviceImplementation="com.intellij.tasks.context.WorkingContextManager"/>
     <applicationService serviceInterface="com.intellij.tasks.config.RecentTaskRepositories"
-                    serviceImplementation="com.intellij.tasks.config.RecentTaskRepositories"/>
+                        serviceImplementation="com.intellij.tasks.config.RecentTaskRepositories"/>
 
     <lang.documentationProvider language="TEXT" implementationClass="com.intellij.tasks.doc.TaskDocumentationProvider"/>
 
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java
index 04e891265d90..d0582be7ae43 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java
@@ -17,10 +17,14 @@
 package com.intellij.tasks.actions;
 
 import com.intellij.CommonBundle;
+import com.intellij.codeInsight.completion.InsertHandler;
+import com.intellij.codeInsight.completion.InsertionContext;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.actionSystem.Shortcut;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
-import com.intellij.openapi.fileTypes.PlainTextLanguage;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.keymap.KeymapUtil;
@@ -35,15 +39,11 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.tasks.*;
 import com.intellij.tasks.config.TaskRepositoriesConfigurable;
-import com.intellij.tasks.impl.TaskCompletionContributor;
 import com.intellij.tasks.impl.TaskManagerImpl;
-import com.intellij.ui.EditorTextField;
-import com.intellij.ui.HyperlinkAdapter;
-import com.intellij.ui.HyperlinkLabel;
-import com.intellij.ui.LanguageTextField;
-import com.intellij.util.Consumer;
+import com.intellij.ui.*;
 import com.intellij.util.ui.AsyncProcessIcon;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -51,7 +51,9 @@ import javax.swing.event.HyperlinkEvent;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author Dmitry Avdeev
@@ -83,21 +85,17 @@ public class ActivateTaskDialog extends DialogWrapper {
     myProject = project;
     setTitle("Open Task");
 
-    myTaskName = new LanguageTextField(PlainTextLanguage.INSTANCE, project, "");
-    myEditorPanel.add(myTaskName);
-
-    TaskCompletionContributor.installCompletion(myTaskName.getDocument(), myProject, new Consumer<Task>() {
-      @Override
-      public void consume(Task task) {
+    myTaskName = new TextFieldWithAutoCompletion<Task>(project, new MyTextFieldWithAutoCompletionListProvider(project) {
+      protected void handleInsert(@NotNull final Task task) {
         mySelectedTask = task;
         taskChanged();
       }
-    }, true);
-    
+    }, false);
+    myEditorPanel.add(myTaskName);
     myTaskName.getDocument().addDocumentListener(new DocumentAdapter() {
       @Override
       public void documentChanged(DocumentEvent e) {
-        taskChanged();        
+        taskChanged();
       }
     });
 
@@ -107,7 +105,7 @@ public class ActivateTaskDialog extends DialogWrapper {
       myNameLabel.setText("Enter task name or press " + KeymapUtil.getShortcutText(shortcuts[0]) + " to choose an existing task:");
     }
     myNameLabel.setLabelFor(myTaskName);
-    
+
     TaskManagerImpl manager = (TaskManagerImpl)TaskManager.getManager(project);
     ControlBinder binder = new ControlBinder(manager.getState());
     binder.bindAnnotations(this);
@@ -140,7 +138,8 @@ public class ActivateTaskDialog extends DialogWrapper {
           });
         }
       });
-    } else {
+    }
+    else {
       myUpdateIcon.setVisible(false);
       myUpdateLabel.setText("");
     }
@@ -184,7 +183,7 @@ public class ActivateTaskDialog extends DialogWrapper {
 
     // refresh change lists
     ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
-    for (Iterator<ChangeListInfo> it = taskManager.getOpenChangelists(task).iterator(); it.hasNext();) {
+    for (Iterator<ChangeListInfo> it = taskManager.getOpenChangelists(task).iterator(); it.hasNext(); ) {
       ChangeListInfo changeListInfo = it.next();
       if (changeListManager.getChangeList(changeListInfo.id) == null) {
         it.remove();
@@ -194,10 +193,12 @@ public class ActivateTaskDialog extends DialogWrapper {
     if (!myVcsEnabled) {
       myCreateChangelist.setEnabled(false);
       myCreateChangelist.setSelected(false);
-    } else if (task != null && !taskManager.getOpenChangelists(task).isEmpty()) {
+    }
+    else if (task != null && !taskManager.getOpenChangelists(task).isEmpty()) {
       myCreateChangelist.setSelected(true);
       myCreateChangelist.setEnabled(false);
-    } else {
+    }
+    else {
       myCreateChangelist.setSelected(taskManager.getState().createChangelist);
       myCreateChangelist.setEnabled(true);
     }
@@ -236,11 +237,11 @@ public class ActivateTaskDialog extends DialogWrapper {
       }
       else if (mySelectedTask == null) {
         if (Messages.showOkCancelDialog(myProject,
-                            "Issue " + lastId + " not found.\n" +
-                            "Do you want to create local task?",
-                            "Issue Not Found",
-                            CommonBundle.getNoButtonText(), CommonBundle.getYesButtonText(),
-                            Messages.getQuestionIcon()) == DialogWrapper.OK_EXIT_CODE) {
+                                        "Issue " + lastId + " not found.\n" +
+                                        "Do you want to create local task?",
+                                        "Issue Not Found",
+                                        CommonBundle.getNoButtonText(), CommonBundle.getYesButtonText(),
+                                        Messages.getQuestionIcon()) == DialogWrapper.OK_EXIT_CODE) {
           return;
         }
         mySelectedTask = manager.createLocalTask(taskName);
@@ -308,4 +309,88 @@ public class ActivateTaskDialog extends DialogWrapper {
       }
     });
   }
+
+  public static class MyTextFieldWithAutoCompletionListProvider extends TextFieldWithAutoCompletionListProvider<Task> {
+    private final TaskSearchSupport mySearchSupport;
+
+    public MyTextFieldWithAutoCompletionListProvider(@Nullable final Project project) {
+      super(null);
+      mySearchSupport = new TaskSearchSupport(project);
+    }
+
+    @Override
+    protected String getQuickDocHotKeyAdvertisementTail(@NotNull String shortcut) {
+      return " would show task description and comments";
+    }
+
+    @NotNull
+    @Override
+    public List<Task> getItems(final String prefix, final boolean cached) {
+      return mySearchSupport.getItems(prefix, cached);
+    }
+
+    @Override
+    public void setItems(@Nullable Collection variants) {
+      // Do nothing
+    }
+
+    @Override
+    public LookupElementBuilder createLookupBuilder(@NotNull final Task task) {
+      LookupElementBuilder builder = super.createLookupBuilder(task);
+
+      builder = builder.addLookupString(task.getSummary());
+      if (task.isClosed()) {
+        builder = builder.setStrikeout();
+      }
+
+      return builder;
+    }
+
+    @Override
+    protected InsertHandler<LookupElement> createInsertHandler(@NotNull final Task task) {
+      return new InsertHandler<LookupElement>() {
+        @Override
+        public void handleInsert(InsertionContext context, LookupElement item) {
+          Document document = context.getEditor().getDocument();
+          String s = task.getId() + ": " + task.getSummary();
+          s = StringUtil.convertLineSeparators(s);
+          document.replaceString(context.getStartOffset(), context.getTailOffset(), s);
+          context.getEditor().getCaretModel().moveToOffset(context.getStartOffset() + s.length());
+
+          MyTextFieldWithAutoCompletionListProvider.this.handleInsert(task);
+        }
+      };
+    }
+
+    protected void handleInsert(@NotNull final Task task) {
+      // Override it for autocompletion insert handler
+    }
+
+    @Override
+    protected Icon getIcon(@NotNull final Task task) {
+      return task.getIcon();
+    }
+
+    @NotNull
+    @Override
+    protected String getLookupString(@NotNull final Task task) {
+      return task.getId();
+    }
+
+    @Override
+    protected String getTailText(@NotNull final Task task) {
+      return " " + task.getSummary();
+    }
+
+    @Override
+    protected String getTypeText(@NotNull final Task task) {
+      return null;
+    }
+
+    @Override
+    public int compare(@NotNull final Task task1, @NotNull final Task task2) {
+      // N/A here
+      throw new UnsupportedOperationException();
+    }
+  }
 }
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskChangelistSupport.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskChangelistSupport.java
index 31786704830b..f41a6b130681 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskChangelistSupport.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskChangelistSupport.java
@@ -20,7 +20,9 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.ui.EditChangelistSupport;
+import com.intellij.tasks.actions.ActivateTaskDialog;
 import com.intellij.ui.EditorTextField;
+import com.intellij.ui.TextFieldWithAutoCompletionContributor;
 import com.intellij.util.Consumer;
 
 import javax.swing.*;
@@ -40,7 +42,10 @@ public class TaskChangelistSupport implements EditChangelistSupport {
 
   public void installSearch(EditorTextField name, final EditorTextField comment) {
     Document document = name.getDocument();
-    TaskCompletionContributor.installCompletion(document, myProject, null, false);
+    final ActivateTaskDialog.MyTextFieldWithAutoCompletionListProvider completionProvider =
+      new ActivateTaskDialog.MyTextFieldWithAutoCompletionListProvider(myProject);
+
+    TextFieldWithAutoCompletionContributor.installCompletion(document, myProject, completionProvider, false);
   }
 
   public Consumer<LocalChangeList> addControls(JPanel bottomPanel, LocalChangeList initial) {
@@ -48,8 +53,8 @@ public class TaskChangelistSupport implements EditChangelistSupport {
     checkBox.setMnemonic('t');
     checkBox.setToolTipText("Reload context (e.g. open editors) when changelist is set active");
     checkBox.setSelected(initial == null ?
-                           myTaskManager.getState().trackContextForNewChangelist :
-                           myTaskManager.getAssociatedTask(initial) != null);
+                         myTaskManager.getState().trackContextForNewChangelist :
+                         myTaskManager.getAssociatedTask(initial) != null);
     bottomPanel.add(checkBox);
     return new Consumer<LocalChangeList>() {
       public void consume(LocalChangeList changeList) {
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java
deleted file mode 100644
index 1b18c8155ade..000000000000
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.intellij.tasks.impl;
-
-import com.intellij.codeInsight.completion.*;
-import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.openapi.actionSystem.IdeActions;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.progress.ProcessCanceledException;
-import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiFile;
-import com.intellij.tasks.Task;
-import com.intellij.tasks.actions.TaskSearchSupport;
-import com.intellij.util.Consumer;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Dmitry Avdeev
- */
-public class TaskCompletionContributor extends CompletionContributor {
-
-  private static final Key<Consumer<Task>> KEY = Key.create("task completion available");
-  private static final Key<Boolean> AUTO_POPUP_KEY = Key.create("task completion auto-popup");
-
-  public static void installCompletion(Document document, Project project, @Nullable Consumer<Task> consumer, boolean autoPopup) {
-    PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
-    if (psiFile != null) {
-      //noinspection unchecked
-      psiFile.putUserData(KEY, consumer == null ? (Consumer<Task>)Consumer.EMPTY_CONSUMER : consumer);
-      psiFile.putUserData(AUTO_POPUP_KEY, autoPopup);
-    }
-  }
-
-  @Override
-  public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
-    PsiFile file = parameters.getOriginalFile();
-    final Consumer<Task> consumer = file.getUserData(KEY);
-
-    if (CompletionService.getCompletionService().getAdvertisementText() == null) {
-      final String shortcut = getActionShortcut(IdeActions.ACTION_QUICK_JAVADOC);
-      if (shortcut != null) {
-        CompletionService.getCompletionService().setAdvertisementText("Pressing " + shortcut + " would show task description and comments");
-      }
-    }
-
-    if (consumer != null) {
-
-      String text = parameters.getOriginalFile().getText();
-      int i = text.lastIndexOf(' ', parameters.getOffset() - 1) + 1;
-      final String prefix = text.substring(i, parameters.getOffset());
-      if (parameters.getInvocationCount() == 0 && !file.getUserData(AUTO_POPUP_KEY)) {   // is autopopup
-        return;
-      }
-      result = result.withPrefixMatcher(new PlainPrefixMatcher(prefix));
-
-      final TaskSearchSupport searchSupport = new TaskSearchSupport(file.getProject());
-      List<Task> items = searchSupport.getItems(prefix, true);
-      addCompletionElements(result, consumer, items, -10000);
-
-      Future<List<Task>> future = ApplicationManager.getApplication().executeOnPooledThread(new Callable<List<Task>>() {
-        @Override
-        public List<Task> call() {
-          return searchSupport.getItems(prefix, false);
-        }
-      });
-
-      while (true) {
-        try {
-          List<Task> tasks = future.get(100, TimeUnit.MILLISECONDS);
-          if (tasks != null) {
-            addCompletionElements(result, consumer, tasks, 0);
-            return;
-          }
-        }
-        catch (ProcessCanceledException e) {
-          throw e;
-        }
-        catch (Exception ignore) {
-
-        }
-        ProgressManager.checkCanceled();
-      }
-    }
-  }
-
-  private static void addCompletionElements(CompletionResultSet result, final Consumer<Task> consumer, List<Task> items, int index) {
-    final AutoCompletionPolicy completionPolicy = ApplicationManager.getApplication().isUnitTestMode()
-                                                  ? AutoCompletionPolicy.ALWAYS_AUTOCOMPLETE
-                                                  : AutoCompletionPolicy.NEVER_AUTOCOMPLETE;
-
-    for (final Task task : items) {
-      LookupElementBuilder builder = LookupElementBuilder.create(task, task.getId())
-        .setIcon(task.getIcon())
-        .addLookupString(task.getSummary())
-        .setTailText(" " + task.getSummary(), true)
-        .setInsertHandler(new InsertHandler<LookupElement>() {
-          @Override
-          public void handleInsert(InsertionContext context, LookupElement item) {
-            Document document = context.getEditor().getDocument();
-            String s = task.getId() + ": " + task.getSummary();
-            s = StringUtil.convertLineSeparators(s);
-            document.replaceString(context.getStartOffset(), context.getTailOffset(), s);
-            context.getEditor().getCaretModel().moveToOffset(context.getStartOffset() + s.length());
-            consumer.consume(task);
-          }
-        });
-      if (task.isClosed()) {
-        builder = builder.setStrikeout();
-      }
-
-      result.addElement(PrioritizedLookupElement.withGrouping(builder.withAutoCompletionPolicy(completionPolicy), index--));
-    }
-  }
-}
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
index bde7713bfb9b..47e775a965de 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
@@ -3,14 +3,16 @@ package com.intellij.tasks;
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.ui.CommitMessage;
 import com.intellij.psi.PsiFile;
+import com.intellij.tasks.actions.ActivateTaskDialog;
 import com.intellij.tasks.impl.LocalTaskImpl;
-import com.intellij.tasks.impl.TaskCompletionContributor;
 import com.intellij.tasks.impl.TaskManagerImpl;
 import com.intellij.testFramework.MapDataContext;
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import com.intellij.ui.TextFieldWithAutoCompletionContributor;
 
 import java.util.Arrays;
 
@@ -64,9 +66,11 @@ public class TaskCompletionTest extends LightCodeInsightFixtureTestCase {
   private void configureFile(String text) {
     PsiFile psiFile = myFixture.configureByText("test.txt", text);
     Document document = myFixture.getDocument(psiFile);
-    TaskCompletionContributor.installCompletion(document, getProject(), null, false);
+    final Project project = getProject();
+    TextFieldWithAutoCompletionContributor.installCompletion(document, project,
+                                                             new ActivateTaskDialog.MyTextFieldWithAutoCompletionListProvider(project),
+                                                             false);
     document.putUserData(CommitMessage.DATA_CONTEXT_KEY, new MapDataContext());
-
   }
 
   private void configureRepository(LocalTaskImpl... tasks) {

From 0112c8c3169426dfde060346884e9306bf6ca729 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Mon, 13 Feb 2012 16:55:18 +0400
Subject: [PATCH 23/26] RUBY-10444  Throwable by HAML plugin

---
 .../htmlInspections/HtmlUnknownAttributeInspection.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java
index 991e9b4f7dd4..9dac096fc6db 100644
--- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java
+++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java
@@ -106,7 +106,8 @@ public class HtmlUnknownAttributeInspection extends HtmlUnknownTagInspection {
             quickfixes[2] = new SwitchToHtml5WithHighPriorityAction();
           }
 
-          holder.registerProblem(nameElement, XmlErrorMessages.message("attribute.is.not.allowed.here", name),
+          if (nameElement.getTextLength() > 0)
+            holder.registerProblem(nameElement, XmlErrorMessages.message("attribute.is.not.allowed.here", name),
                                  ProblemHighlightType.GENERIC_ERROR_OR_WARNING, quickfixes);
         }
       }

From d55090905f02d04e6692ab386fe36b7254c3b241 Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Tue, 14 Feb 2012 19:10:36 +0400
Subject: [PATCH 24/26] LESS: color scheme updated

---
 .../src/colorSchemes/all_hallows_eve.xml      | 90 ++++++++++++++++++
 colorSchemes/src/colorSchemes/blackboard.xml  | 90 ++++++++++++++++++
 colorSchemes/src/colorSchemes/cobalt.xml      | 90 ++++++++++++++++++
 colorSchemes/src/colorSchemes/monokai.xml     | 90 ++++++++++++++++++
 colorSchemes/src/colorSchemes/rails_casts.xml | 90 ++++++++++++++++++
 colorSchemes/src/colorSchemes/twilight.xml    | 90 ++++++++++++++++++
 colorSchemes/src/colorSchemes/vibrant_ink.xml | 91 +++++++++++++++++++
 7 files changed, 631 insertions(+)

diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index 3fdd590e17d4..1c744668d830 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -1592,6 +1592,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND"/>
@@ -2542,6 +2562,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index 91f5adf0e53b..89516234bae0 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -1572,6 +1572,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND"/>
@@ -2522,6 +2542,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index 398db36aaa2d..6ffba9748367 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1812,6 +1812,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="223545"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="223545"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND" value="cccccc"/>
@@ -2822,6 +2842,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index eadeda1b9810..9642e54cd1fd 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -1572,6 +1572,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND"/>
@@ -2502,6 +2522,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index e4e7d434a95b..fb1c262bb681 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1792,6 +1792,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="232323"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="232323"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND" value="d0d0ff"/>
@@ -2802,6 +2822,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index 7eafd6ca8440..d8039e76522d 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1582,6 +1582,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="202020"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="202020"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND" value="7587a6"/>
@@ -2542,6 +2562,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index bba5d97a2b42..a7c9db958713 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -1612,6 +1612,26 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="LESS_INJECTED_CODE">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="LESS_JS_CODE_DELIM">
+      <value>
+        <option name="FOREGROUND" value="ffffff"/>
+        <option name="BACKGROUND" value="0"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
         <option name="FOREGROUND" value="ffffff"/>
@@ -2552,6 +2572,76 @@
         <option name="ERROR_STRIPE_COLOR"/>
       </value>
     </option>
+    <option name="SCOPE_KEY_All">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Changed Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Default">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Non-Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Problems">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Project Files">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
+    <option name="SCOPE_KEY_Tests">
+      <value>
+        <option name="FOREGROUND"/>
+        <option name="BACKGROUND"/>
+        <option name="FONT_TYPE" value="0"/>
+        <option name="EFFECT_COLOR"/>
+        <option name="EFFECT_TYPE" value="0"/>
+        <option name="ERROR_STRIPE_COLOR"/>
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND"/>
@@ -2854,3 +2944,4 @@
     </option>
   </attributes>
 </scheme>
+

From 4c7f838dff907bf2e7ff6f1db5cc3081cba20455 Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Wed, 15 Feb 2012 13:16:15 +0400
Subject: [PATCH 25/26] cosmetics

---
 .../sm/runner/ui/SMTRunnerConsoleView.java     | 17 ++---------------
 .../runner/ui/SMTRunnerUIActionsHandler.java   | 16 +++++++---------
 .../sm/runner/ui/TestResultsViewer.java        | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
index a91d9688b322..2266723722d1 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
@@ -42,11 +42,10 @@ public class SMTRunnerConsoleView extends BaseTestsOutputConsoleView {
   }
 
   /**
-   *
    * @param consoleProperties
    * @param runnerSettings
    * @param configurationPerRunnerSettings
-   * @param splitterProperty Key to store(project level) latest value of testTree/consoleTab splitter. E.g. "RSpec.Splitter.Proportion"
+   * @param splitterProperty               Key to store(project level) latest value of testTree/consoleTab splitter. E.g. "RSpec.Splitter.Proportion"
    */
   public SMTRunnerConsoleView(final TestConsoleProperties consoleProperties, final RunnerSettings runnerSettings,
                               final ConfigurationPerRunnerSettings configurationPerRunnerSettings,
@@ -73,19 +72,7 @@ public class SMTRunnerConsoleView extends BaseTestsOutputConsoleView {
     super.initUI();
 
     // Console
-    myResultsViewer.addEventsListener(new TestResultsViewer.EventsListener() {
-      public void onTestNodeAdded(TestResultsViewer sender, SMTestProxy test) {
-        // Do nothing
-      }
-
-      public void onTestingStarted(TestResultsViewer sender) {
-        // Do nothing
-      }
-
-      public void onTestingFinished(TestResultsViewer sender) {
-        // Do nothing
-      }
-
+    myResultsViewer.addEventsListener(new TestResultsViewer.SMEventsAdapter() {
       public void onSelected(@Nullable final SMTestProxy selectedTestProxy,
                              @NotNull final TestResultsViewer viewer,
                              @NotNull final TestFrameworkRunningModel model) {
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandler.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandler.java
index 52b00aed4532..c3bb34b020c8 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandler.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandler.java
@@ -32,7 +32,7 @@ import java.util.List;
 /**
  * @author Roman Chernyatchik
  */
-public class SMTRunnerUIActionsHandler implements TestResultsViewer.EventsListener {
+public class SMTRunnerUIActionsHandler extends TestResultsViewer.SMEventsAdapter {
   private final TestConsoleProperties myConsoleProperties;
 
   public SMTRunnerUIActionsHandler(final TestConsoleProperties consoleProperties) {
@@ -45,10 +45,6 @@ public class SMTRunnerUIActionsHandler implements TestResultsViewer.EventsListen
     }
   }
 
-  public void onTestingStarted(TestResultsViewer sender) {
-    // Do nothing
-  }
-
   public void onTestingFinished(final TestResultsViewer sender) {
     // select first defect at the end (my be TRACK_RUNNING_TEST was enabled and affects on the fly selection)
     final SMTestProxy testsRootNode = sender.getTestsRootNode();
@@ -60,12 +56,14 @@ public class SMTRunnerUIActionsHandler implements TestResultsViewer.EventsListen
       final List<SMTestProxy> allTests = testsRootNode.getAllTests();
       final AbstractTestProxy firstError = ProxyFilters.ERROR_LEAF.detectIn(allTests);
       if (firstError != null) {
-       firstDefect = firstError;
-      } else {
+        firstDefect = firstError;
+      }
+      else {
         final AbstractTestProxy firstFailure = ProxyFilters.FAILURE_LEAF.detectIn(allTests);
         if (firstFailure != null) {
-         firstDefect = firstFailure;
-        } else {
+          firstDefect = firstFailure;
+        }
+        else {
           firstDefect = null;
         }
       }
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestResultsViewer.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestResultsViewer.java
index 3522a8dc648e..eae35aa8d70d 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestResultsViewer.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestResultsViewer.java
@@ -28,12 +28,14 @@ import org.jetbrains.annotations.Nullable;
 public interface TestResultsViewer extends Disposable {
   /**
    * Fake Root for toplevel test suits/tests
+   *
    * @return root
    */
   SMTestProxy getTestsRootNode();
 
   /**
    * Selects test or suite in Tests tree and notify about selection changed
+   *
    * @param proxy
    */
   void selectAndNotify(@Nullable AbstractTestProxy proxy);
@@ -49,24 +51,30 @@ public interface TestResultsViewer extends Disposable {
 
   interface EventsListener extends TestProxyTreeSelectionListener {
     void onTestingStarted(TestResultsViewer sender);
+
     void onTestingFinished(TestResultsViewer sender);
+
     void onTestNodeAdded(TestResultsViewer sender, SMTestProxy test);
   }
 
-  class SMEventsAdapter implements  EventsListener {
+  class SMEventsAdapter implements EventsListener {
 
     @Override
-    public void onTestingStarted(TestResultsViewer sender) {}
+    public void onTestingStarted(TestResultsViewer sender) {
+    }
 
     @Override
-    public void onTestingFinished(TestResultsViewer sender) {}
+    public void onTestingFinished(TestResultsViewer sender) {
+    }
 
     @Override
-    public void onTestNodeAdded(TestResultsViewer sender, SMTestProxy test) {}
+    public void onTestNodeAdded(TestResultsViewer sender, SMTestProxy test) {
+    }
 
     @Override
     public void onSelected(@Nullable SMTestProxy selectedTestProxy,
                            @NotNull TestResultsViewer viewer,
-                           @NotNull TestFrameworkRunningModel model) {}
+                           @NotNull TestFrameworkRunningModel model) {
+    }
   }
 }

From 72720fba9ca520ff5a1aa0b2dc1a7ea53202fcaf Mon Sep 17 00:00:00 2001
From: Roman Chernyatchik <roman.chernyatchik@jetbrains.com>
Date: Wed, 15 Feb 2012 13:17:45 +0400
Subject: [PATCH 26/26] Fixed [RUBY-10369] "Select first failed test on
 finished" not working

---
 .../testframework/sm/runner/ui/SMTestRunnerResultsForm.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
index c2b5e04dc23c..1291d09d6c1c 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
@@ -244,12 +244,12 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
 
     LvcsHelper.addLabel(this);
 
-    fireOnTestingFinished();
-
     SMTestProxy root = getTestsRootNode();
     if (root != null) {
       selectAndNotify(root);
     }
+
+    fireOnTestingFinished();
   }
 
   public void onTestsCountInSuite(final int count) {