diff --git a/colors.scheme.xml b/colors.scheme.xml
index 3c10e4f..38fa5aa 100644
--- a/colors.scheme.xml
+++ b/colors.scheme.xml
@@ -1,5 +1,5 @@
 <application>
   <component name="EditorColorsManagerImpl">
-    <global_color_scheme name="TheoryOfNekomata" />
+    <global_color_scheme name="Material Oceanic" />
   </component>
 </application>
\ No newline at end of file
diff --git a/colors/Material Oceanic.icls b/colors/Material Oceanic.icls
index 7e4fa30..d53417d 100644
--- a/colors/Material Oceanic.icls	
+++ b/colors/Material Oceanic.icls	
@@ -80,7 +80,9 @@
     <option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="ab7967" />
     <option name="FILESTATUS_MERGED" value="c792ea" />
     <option name="FILESTATUS_MODIFIED" value="80cbc4" />
+    <option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
     <option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" />
+    <option name="FILESTATUS_OBSOLETE" value="ffcb6b" />
     <option name="FILESTATUS_SUPPRESSED" value="546e7a" />
     <option name="FILESTATUS_SWITCHED" value="c792ea" />
     <option name="FILESTATUS_UNKNOWN" value="f77669" />
@@ -241,9 +243,9 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="BASH.HERE_DOC_END" baseAttributes="" />
-    <option name="BASH.HERE_DOC_START" baseAttributes="" />
-    <option name="BASH.SHEBANG" baseAttributes="" />
+    <option name="BASH.HERE_DOC_END" baseAttributes="DEFAULT_KEYWORD" />
+    <option name="BASH.HERE_DOC_START" baseAttributes="DEFAULT_KEYWORD" />
+    <option name="BASH.SHEBANG" baseAttributes="BASH.LINE_COMMENT" />
     <option name="BLINKING_HIGHLIGHTS_ATTRIBUTES">
       <value>
         <option name="EFFECT_COLOR" value="9c88" />
@@ -520,8 +522,8 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="" />
-    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="" />
+    <option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="DEFAULT_STRING" />
+    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
     <option name="Class" baseAttributes="" />
     <option name="Closure braces">
       <value>
@@ -808,35 +810,11 @@
     <option name="DUPLICATE_FROM_SERVER">
       <value />
     </option>
-    <option name="ELIXIR_ALIAS" baseAttributes="" />
     <option name="ELIXIR_BIT">
       <value>
         <option name="FOREGROUND" value="89ddff" />
       </value>
     </option>
-    <option name="ELIXIR_BRACES" baseAttributes="" />
-    <option name="ELIXIR_BRACKET" baseAttributes="" />
-    <option name="ELIXIR_CALLBACK" baseAttributes="" />
-    <option name="ELIXIR_CHAR_LIST" baseAttributes="" />
-    <option name="ELIXIR_CHAR_TOKEN" baseAttributes="" />
-    <option name="ELIXIR_DOT" baseAttributes="" />
-    <option name="ELIXIR_EXPRESSION_SUBSTITUTION_MARK" baseAttributes="" />
-    <option name="ELIXIR_FUNCTION_CALL" baseAttributes="" />
-    <option name="ELIXIR_IGNORED_VARIABLE" baseAttributes="" />
-    <option name="ELIXIR_MACRO_CALL" baseAttributes="" />
-    <option name="ELIXIR_MAP" baseAttributes="" />
-    <option name="ELIXIR_OPERATION_SIGN" baseAttributes="" />
-    <option name="ELIXIR_PARAMETER" baseAttributes="" />
-    <option name="ELIXIR_PARENTHESES" baseAttributes="" />
-    <option name="ELIXIR_PREDEFINED" baseAttributes="" />
-    <option name="ELIXIR_SIGIL" baseAttributes="" />
-    <option name="ELIXIR_SPECIFICATION" baseAttributes="" />
-    <option name="ELIXIR_STRING" baseAttributes="" />
-    <option name="ELIXIR_STRUCT" baseAttributes="" />
-    <option name="ELIXIR_TYPE" baseAttributes="" />
-    <option name="ELIXIR_TYPE_PARAMETER" baseAttributes="" />
-    <option name="ELIXIR_VALID_ESCAPE_SEQUENCE" baseAttributes="" />
-    <option name="ELIXIR_VARIABLE" baseAttributes="" />
     <option name="ENUM_CONST">
       <value>
         <option name="FOREGROUND" value="9373a5" />
@@ -873,7 +851,7 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
-    <option name="GHERKIN_REGEXP_PARAMETER" baseAttributes="" />
+    <option name="GHERKIN_REGEXP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="GIT_TOOLBOX.CHANGED_COUNT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="ffcb6b" />
diff --git a/colors/TheoryOfNekomata.icls b/colors/TheoryOfNekomata.icls
index 37c69ac..18a1273 100644
--- a/colors/TheoryOfNekomata.icls
+++ b/colors/TheoryOfNekomata.icls
@@ -189,8 +189,8 @@
         <option name="EFFECT_COLOR" value="99cc" />
       </value>
     </option>
-    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="" />
-    <option name="CUSTOM_KEYWORD1_ATTRIBUTES" baseAttributes="" />
+    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" />
+    <option name="CUSTOM_KEYWORD1_ATTRIBUTES" baseAttributes="DEFAULT_KEYWORD" />
     <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="aaa321" />
@@ -209,11 +209,11 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="" />
-    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="" />
-    <option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="" />
-    <option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="" />
-    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="" />
+    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
+    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
+    <option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
+    <option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="DEFAULT_STRING" />
+    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
     <option name="DEFAULT_ATTRIBUTE">
       <value>
         <option name="FOREGROUND" value="ffa1c9" />
diff --git a/colors/_@user_Darcula.icls b/colors/_@user_Darcula.icls
index 43fb6ca..2d03a01 100644
--- a/colors/_@user_Darcula.icls
+++ b/colors/_@user_Darcula.icls
@@ -7,16 +7,24 @@
     <property name="originalScheme">Darcula</property>
   </metaInfo>
   <colors>
-    <option name="FILESTATUS_ADDED" value="c3e887" />
-    <option name="FILESTATUS_DELETED" value="f77669" />
+    <option name="FILESTATUS_ADDED" value="c3e88d" />
+    <option name="FILESTATUS_DELETED" value="808080" />
     <option name="FILESTATUS_HIJACKED" value="ffcb6b" />
-    <option name="FILESTATUS_MODIFIED" value="eac651" />
+    <option name="FILESTATUS_IDEA_FILESTATUS_DELETED_FROM_FILE_SYSTEM" value="808080" />
+    <option name="FILESTATUS_IDEA_FILESTATUS_IGNORED" value="ab7967" />
+    <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="fc9867" />
+    <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="fc9867" />
+    <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="fc9867" />
+    <option name="FILESTATUS_MERGED" value="c792ea" />
+    <option name="FILESTATUS_MODIFIED" value="80cbc4" />
     <option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
     <option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" />
     <option name="FILESTATUS_OBSOLETE" value="ffcb6b" />
     <option name="FILESTATUS_SUPPRESSED" value="546e7a" />
-    <option name="FILESTATUS_SWITCHED" value="f77669" />
+    <option name="FILESTATUS_SWITCHED" value="c792ea" />
     <option name="FILESTATUS_UNKNOWN" value="f77669" />
-    <option name="FILESTATUS_modifiedOutside" value="f3db88" />
+    <option name="FILESTATUS_addedOutside" value="ffcb6b" />
+    <option name="FILESTATUS_changelistConflict" value="fc9867" />
+    <option name="FILESTATUS_modifiedOutside" value="c792ea" />
   </colors>
 </scheme>
\ No newline at end of file
diff --git a/ide.general.xml b/ide.general.xml
index 26a2fb2..8e5f0b1 100644
--- a/ide.general.xml
+++ b/ide.general.xml
@@ -5,15 +5,12 @@
     <option name="confirmOpenNewProject2" value="-1" />
   </component>
   <component name="Registry">
-    <entry key="ide.animate.toolwindows" value="true" />
     <entry key="ide.experimental.ui" value="true" />
+    <entry key="ide.balloon.shadow.size" value="0" />
+    <entry key="ide.animate.toolwindows" value="true" />
     <entry key="editor.focus.mode.color.light" value="444444" />
     <entry key="ide.new.editor.tabs.vertical.borders" value="true" />
     <entry key="editor.focus.mode.color.dark" value="444444" />
     <entry key="ide.editor.tab.selection.animation" value="true" />
-    <entry key="ide.balloon.shadow.size" value="0" />
-    <entry key="ide.experimental.ui.inter.font" value="false" />
-    <entry key="debugger.new.tool.window.layout" value="false" />
-    <entry key="idea.plugins.compatible.build" value="" />
   </component>
 </application>
\ No newline at end of file
diff --git a/laf.xml b/laf.xml
index 0bfa02e..b2fe27b 100644
--- a/laf.xml
+++ b/laf.xml
@@ -1,8 +1,9 @@
 <application>
-  <component name="LafManager" autodetect="false">
-    <laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" themeId="CUSTOM" />
+  <component name="LafManager">
+    <laf themeId="CUSTOM" />
     <lafs-to-previous-schemes>
       <laf-to-scheme laf="Custom Theme (Material)" scheme="TheoryOfNekomata" />
+      <laf-to-scheme laf="Darcula" scheme="TheoryOfNekomata" />
       <laf-to-scheme laf="Dark" scheme="TheoryOfNekomata" />
     </lafs-to-previous-schemes>
   </component>
diff --git a/material_theme_new.xml b/material_theme_new.xml
new file mode 100644
index 0000000..657391b
--- /dev/null
+++ b/material_theme_new.xml
@@ -0,0 +1,24 @@
+<application>
+  <component name="MaterialThemeNewConfig">
+    <option name="accentState">
+      <MTAccentConfigState>
+        <option name="accentColorHex" value="009688" />
+      </MTAccentConfigState>
+    </option>
+    <option name="lightCustomThemeState">
+      <MTLightCustomThemeConfigState>
+        <option name="colorScheme" value="Material Oceanic" />
+      </MTLightCustomThemeConfigState>
+    </option>
+    <option name="metadata">
+      <MTMetadataState>
+        <option name="userId" value="-1bad800e:190682aa055:-7ff5" />
+      </MTMetadataState>
+    </option>
+    <option name="themeState">
+      <MTThemeConfigState>
+        <option name="selectedThemeName" value="CUSTOM" />
+      </MTThemeConfigState>
+    </option>
+  </component>
+</application>
\ No newline at end of file