diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80d0184f..debea3d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,9 @@ Changelog structure reference:
 
 ## [Unreleased]
 
+- Zig
+  - Improved default colors
+
 ## [20.2.2]
 
 ### Fixed
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt
index 3e278c67..336aca4c 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigSyntaxHighlighter.kt
@@ -45,15 +45,24 @@ class ZigSyntaxHighlighter: SyntaxHighlighterBase() {
         // @formatter:off
         val BAD_CHAR          = createKey("BAD_CHARACTER"      , HighlighterColors.BAD_CHARACTER                        )
         val BUILTIN           = createKey("BUILTIN"            , DefaultLanguageHighlighterColors.STATIC_METHOD         )
-        val CHAR              = createKey("CHAR"               , DefaultLanguageHighlighterColors.NUMBER                )
+        val NUMBER            = createKey("NUMBER"             , DefaultLanguageHighlighterColors.NUMBER                )
+        val CHAR              = createKey("CHAR"               , NUMBER                                                 )
+        val TYPE_DECL         = createKey("TYPE_DECL"          , DefaultLanguageHighlighterColors.CLASS_NAME            )
+        val TYPE_DECL_GEN     = createKey("TYPE_DECL_GEN"      , TYPE_DECL                                              )
+        val TYPE_REF          = createKey("TYPE"               , DefaultLanguageHighlighterColors.CLASS_REFERENCE       )
+        val TYPE_REF_GEN      = createKey("TYPE_GEN"           , TYPE_REF                                               )
+        val TYPE_PARAM_DECL   = createKey("TYPE_PARAM_DECL"    , TYPE_REF                                               )
+        val TYPE_PARAM        = createKey("TYPE_PARAM"         , TYPE_PARAM_DECL                                        )
+        val STRUCT_DECL       = createKey("STRUCT_DECL"        , TYPE_DECL                                              )
+        val STRUCT_REF        = createKey("STRUCT"             , TYPE_REF                                               )
         val COMMENT           = createKey("COMMENT"            , DefaultLanguageHighlighterColors.LINE_COMMENT          )
         val COMMENT_DOC       = createKey("COMMENT_DOC"        , DefaultLanguageHighlighterColors.DOC_COMMENT           )
-        val ENUM_DECL         = createKey("ENUM_DECL"          , DefaultLanguageHighlighterColors.CLASS_NAME            )
-        val ENUM_REF          = createKey("ENUM"               , DefaultLanguageHighlighterColors.CLASS_REFERENCE       )
-        val ENUM_MEMBER_DECL  = createKey("ENUM_MEMBER_DECL"   , DefaultLanguageHighlighterColors.STATIC_FIELD          )
+        val ENUM_DECL         = createKey("ENUM_DECL"          , STRUCT_DECL                                            )
+        val ENUM_REF          = createKey("ENUM"               , STRUCT_REF                                             )
+        val ENUM_MEMBER_DECL  = createKey("ENUM_MEMBER_DECL"   , DefaultLanguageHighlighterColors.CONSTANT              )
         val ENUM_MEMBER_REF   = createKey("ENUM_MEMBER"        , ENUM_MEMBER_DECL                                       )
-        val ERROR_TAG_DECL    = createKey("ERROR_TAG_DECL"     , DefaultLanguageHighlighterColors.STATIC_FIELD          )
-        val ERROR_TAG_REF     = createKey("ERROR_TAG"          , ERROR_TAG_DECL                                         )
+        val ERROR_TAG_DECL    = createKey("ERROR_TAG_DECL"     , ENUM_MEMBER_DECL                                       )
+        val ERROR_TAG_REF     = createKey("ERROR_TAG"          , ENUM_MEMBER_REF                                        )
         val PROPERTY_DECL     = createKey("PROPERTY_DECL"      , DefaultLanguageHighlighterColors.INSTANCE_FIELD        )
         val PROPERTY_REF      = createKey("PROPERTY"           , PROPERTY_DECL                                          )
         val FUNCTION_DECL     = createKey("FUNCTION_DECL"      , DefaultLanguageHighlighterColors.FUNCTION_DECLARATION  )
@@ -67,27 +76,18 @@ class ZigSyntaxHighlighter: SyntaxHighlighterBase() {
         val METHOD_DECL_GEN   = createKey("METHOD_DECL_GEN"    , METHOD_DECL                                            )
         val METHOD_REF        = createKey("METHOD"             , FUNCTION_REF                                           )
         val METHOD_REF_GEN    = createKey("METHOD_GEN"         , METHOD_REF                                             )
-        val NAMESPACE_DECL    = createKey("NAMESPACE_DECL"     , DefaultLanguageHighlighterColors.CLASS_NAME            )
-        val NAMESPACE_REF     = createKey("NAMESPACE"          , DefaultLanguageHighlighterColors.CLASS_REFERENCE       )
-        val NUMBER            = createKey("NUMBER"             , DefaultLanguageHighlighterColors.NUMBER                )
         val OPERATOR          = createKey("OPERATOR"           , DefaultLanguageHighlighterColors.OPERATION_SIGN        )
         val PARAMETER         = createKey("PARAMETER"          , DefaultLanguageHighlighterColors.PARAMETER             )
         val STRING            = createKey("STRING"             , DefaultLanguageHighlighterColors.STRING                )
         val STRING_ESC_V      = createKey("STRING_ESC_V"       , DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE   )
         val STRING_ESC_I_C    = createKey("STRING_ESC_I_C"     , DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE )
         val STRING_ESC_I_U    = createKey("STRING_ESC_I_U"     , DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE )
-        val STRUCT_DECL       = createKey("STRUCT_DECL"        , DefaultLanguageHighlighterColors.CLASS_NAME            )
-        val STRUCT_REF        = createKey("STRUCT"             , DefaultLanguageHighlighterColors.CLASS_REFERENCE       )
-        val TYPE_DECL         = createKey("TYPE_DECL"          , DefaultLanguageHighlighterColors.CLASS_NAME            )
-        val TYPE_DECL_GEN     = createKey("TYPE_DECL_GEN"      , TYPE_DECL                                              )
-        val TYPE_REF          = createKey("TYPE"               , DefaultLanguageHighlighterColors.CLASS_REFERENCE       )
-        val TYPE_REF_GEN      = createKey("TYPE_GEN"           , TYPE_REF                                               )
-        val TYPE_PARAM        = createKey("TYPE_PARAM"         , DefaultLanguageHighlighterColors.PARAMETER             )
-        val TYPE_PARAM_DECL   = createKey("TYPE_PARAM_DECL"    , TYPE_PARAM                                             )
-        val VARIABLE_DECL     = createKey("VARIABLE_DECL"      , DefaultLanguageHighlighterColors.LOCAL_VARIABLE        )
-        val VARIABLE_DECL_DEPR= createKey("VARIABLE_DECL_DEPR" , VARIABLE_DECL                                          )
-        val VARIABLE_REF      = createKey("VARIABLE"           , VARIABLE_DECL                                          )
+        val NAMESPACE_DECL    = createKey("NAMESPACE_DECL"     , STRUCT_DECL                                            )
+        val NAMESPACE_REF     = createKey("NAMESPACE"          , STRUCT_REF                                             )
+        val VARIABLE_REF      = createKey("VARIABLE"           , DefaultLanguageHighlighterColors.LOCAL_VARIABLE        )
         val VARIABLE_REF_DEPR = createKey("VARIABLE_REF_DEPL"  , VARIABLE_REF                                           )
+        val VARIABLE_DECL     = createKey("VARIABLE_DECL"      , VARIABLE_REF                                           )
+        val VARIABLE_DECL_DEPR= createKey("VARIABLE_DECL_DEPR" , VARIABLE_DECL                                          )
         // @formatter:on
 
         private val EMPTY_KEYS = arrayOf<TextAttributesKey>()
diff --git a/core/src/main/resources/META-INF/zigbrains-core.xml b/core/src/main/resources/META-INF/zigbrains-core.xml
index e790d200..3c0f9c6d 100644
--- a/core/src/main/resources/META-INF/zigbrains-core.xml
+++ b/core/src/main/resources/META-INF/zigbrains-core.xml
@@ -54,6 +54,11 @@
         <languageInjectionPerformer
                 language="Zig"
                 implementationClass="com.falsepattern.zigbrains.zig.injection.ZigLanguageInjectionPerformer"/>
+
+        <!--suppress PluginXmlValidity -->
+        <additionalTextAttributes
+                scheme="Darcula"
+                file="colors/ZigColorsConfiguration.xml"/>
     </extensions>
     <!-- endregion Zig -->
 
diff --git a/core/src/main/resources/colors/ZigColorsConfiguration.xml b/core/src/main/resources/colors/ZigColorsConfiguration.xml
new file mode 100644
index 00000000..4716a95d
--- /dev/null
+++ b/core/src/main/resources/colors/ZigColorsConfiguration.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<list>
+    <option name="ZIG_TYPE">
+        <value>
+            <option name="FOREGROUND" value="B5B6E3"/>
+        </value>
+    </option>
+    <option name="ZIG_TYPE_DECL">
+        <value>
+            <option name="FOREGROUND" value="B5B6E3"/>
+        </value>
+    </option>
+    <option name="ZIG_VARIABLE">
+        <value>
+            <option name="FOREGROUND" value="FBB4B4"/>
+        </value>
+    </option>
+    <option name="ZIG_FUNCTION">
+        <value>
+            <option name="FOREGROUND" value="97F1FD"/>
+        </value>
+    </option>
+</list>
\ No newline at end of file