diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java
index 7b6be3444..200e60f6c 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java
@@ -14,11 +14,11 @@ import noppes.npcs.client.gui.util.script.interpreter.type.TypeInfo;
 public enum TokenType {
     // Comments and strings have highest priority - they override everything inside them
     COMMENT(0xFF777777, 140),
-    STRING(0xFFCC8855, 130),
+    STRING(0xFF17C6A3, 130),
     
     // JSDoc elements - lower priority but will fill gaps left by fragmented comment marking
-    JSDOC_TAG(0xFFCC9933, 125,true, true),           // @param, @type, @return etc. (gold/orange)
-    JSDOC_TYPE(0xFF00AAAA, 124),          // {TypeName} in JSDoc (aqua like types)
+    JSDOC_TAG(0xFF8E8070, 125,true, true),           // @param, @type, @return etc. (gold/orange)
+    JSDOC_TYPE(0xFF9A8C7C, 124),          // {TypeName} in JSDoc (aqua like types)
     
     UNUSED_IMPORT(0xFF666666, 119),       // unused import statements (gray)
     
@@ -26,9 +26,9 @@ public enum TokenType {
     KEYWORD(0xFFFF5555, 100,true, false),            // control flow: if, else, for, while, etc.
     
     // Type declarations and references
-    INTERFACE_DECL(0xFF55FFFF, 85),      // interface names (aqua)
+    INTERFACE_DECL(0xFF80F2F6, 85),      // interface names (aqua)
     ENUM_DECL(0xFFFF55FF, 85),           // enum names (magenta)
-    ENUM_CONSTANT(0xFF55FFFF, 84, true, false),  // enum constant values (blue, bold+italic) - like IntelliJ
+    ENUM_CONSTANT(0xFF55FFFF, 84, true, true),  // enum constant values (blue, bold+italic) - like IntelliJ
     CLASS_DECL(0xFF00AAAA, 85),          // class names in declarations
     IMPORTED_CLASS(0xFF00AAAA, 75),      // imported class usages
     GENERIC_TYPE_PARAM(0xFF00FA9A, 76), // generic type parameters like T, E, K, V (light green)
@@ -43,10 +43,10 @@ public enum TokenType {
     PARAMETER(0xFF5555FF, 36),           // method parameters (blue)
     GLOBAL_FIELD(0xFF55FFFF, 35),        // class-level fields (aqua)
     LOCAL_FIELD(0xFFFFFF55, 25),         // local variables (yellow)
-    STATIC_FINAL_FIELD(0xFFFF55FF, 36, false, true), // static final fields (magenta, italic)
+    STATIC_FINAL_FIELD(0xFFFF55FF, 36, true, true), // static final fields (magenta, italic)
 
     // Literals
-    LITERAL(0xFF777777, 40),             // numeric and boolean literals
+    LITERAL(0xFF79C0FF, 40),             // numeric and boolean literals
 
     // Default
     VARIABLE(0xFFFFFFFF, 30),            // generic variables
diff --git a/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json b/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json
index 8b41acc3f..6a0da80b8 100644
--- a/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json
+++ b/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json
@@ -16,17 +16,17 @@
     "italic": false
   },
   "STRING": {
-    "color": "#FFCC8855",
+    "color": "#FF16c57d",
     "bold": false,
     "italic": false
   },
   "JSDOC_TAG": {
-    "color": "#FFCC9933",
-    "bold": false,
+    "color": "#FF8E8070",
+    "bold": true,
     "italic": false
   },
   "JSDOC_TYPE": {
-    "color": "#FF00AAAA",
+    "color": "#FF9A8C7C",
     "bold": false,
     "italic": false
   },
@@ -35,28 +35,13 @@
     "bold": false,
     "italic": false
   },
-  "CLASS_KEYWORD": {
-    "color": "#FFFF5555",
-    "bold": false,
-    "italic": false
-  },
-  "IMPORT_KEYWORD": {
-    "color": "#FFFFAA00",
-    "bold": false,
-    "italic": false
-  },
   "KEYWORD": {
     "color": "#FFFF5555",
     "bold": false,
     "italic": false
   },
-  "MODIFIER": {
-    "color": "#FFFFAA00",
-    "bold": false,
-    "italic": false
-  },
   "INTERFACE_DECL": {
-    "color": "#FF55FFFF",
+    "color": "#FF80F2F6",
     "bold": false,
     "italic": false
   },
@@ -68,7 +53,7 @@
   "ENUM_CONSTANT": {
     "color": "#FF55FFFF",
     "bold": true,
-    "italic": false
+    "italic": true
   },
   "CLASS_DECL": {
     "color": "#FF00AAAA",
@@ -121,12 +106,12 @@
     "italic": false
   },
   "STATIC_FINAL_FIELD": {
-    "color": "#FFFF55FF",
-    "bold": false,
+    "color": "#FF8DDAF8",
+    "bold": true,
     "italic": true
   },
   "LITERAL": {
-    "color": "#FF777777",
+    "color": "#FF79C0FF",
     "bold": false,
     "italic": false
   },