Improved FlatLafDark editor color profile.

Ported base color scheme and syntax specific color schemes from NB-Darcula.
Added color schemes for YAML and Markdown.
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java
index d229d21..ac8c721 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java
@@ -30,7 +30,8 @@
     @Override
     public UIDefaults getDefaults() {
         UIDefaults ret = super.getDefaults();
-        ret.put( "nb.dark.theme", Boolean.TRUE );
+        ret.put( "nb.dark.theme", Boolean.TRUE ); //NOI18N
+        ret.put( "nb.preferred.color.profile", "FlatLaf Dark"); //NOI18N
         return ret;
     }
 
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-ApacheConf-tokenColorings.xml
old mode 100644
new mode 100755
similarity index 60%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-ApacheConf-tokenColorings.xml
index 51d04f8..11f0e03
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-ApacheConf-tokenColorings.xml
@@ -20,12 +20,16 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
+    <fontcolor name="comment" default="comment"/>
+    <fontcolor name="directive" default="keyword"><font style="bold"/></fontcolor>
+    <fontcolor name="directiveparam" default="keyword" foreColor="ffa9b7c6"/>
+    <fontcolor name="error" default="error"/>
+    <fontcolor name="flag" default="separator" foreColor="ff628fb5"/>
+    <fontcolor name="number" default="number"/>
+    <fontcolor name="string" default="string"/>
+    <fontcolor name="tag" default="keyword" foreColor="ffe8bf6a"/>
+    <fontcolor name="tagparam" default="keyword" foreColor="ff009900"/>
+    <fontcolor name="variable" default="identifier"/>
+    <fontcolor name="whitespace" default="whitespace"/>
 </fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-CSS-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-CSS-tokenColorings.xml
new file mode 100644
index 0000000..d3d9f9a
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-CSS-tokenColorings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="at_rule_symbol" foreColor="ffcc7832"/>
+    <fontcolor name="braces" default="separator"/>
+    <fontcolor name="comments" default="comment"/>
+    <fontcolor name="hashes" default="number"/>
+    <fontcolor name="identifiers" default="identifier"/>
+    <fontcolor name="mod-class" foreColor="ffe8bf6a"><font style="italic"/></fontcolor>
+    <fontcolor name="mod-constructor"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-custom1"/>
+    <fontcolor name="mod-custom2"><font style="italic"/></fontcolor>
+    <fontcolor name="mod-custom3" foreColor="ffcc7832"><font style="italic"/></fontcolor>
+    <fontcolor name="mod-local-variable" foreColor="ff00a4a4"/>
+    <fontcolor name="mod-method" foreColor="ff6a8759"/>
+    <fontcolor name="mod-private" foreColor="ff00a4a4"><font style="bold"/></fontcolor>
+    <fontcolor name="numbers" default="number"/>
+    <fontcolor name="operators" default="operator"/>
+    <fontcolor name="others" default="default"/>
+    <fontcolor name="separators" default="separator"/>
+    <fontcolor name="strings" default="string"/>
+    <fontcolor name="uris" default="string"/>
+    <fontcolor name="whitespaces" default="default"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-DTD-tokenColorings.xml
similarity index 66%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-DTD-tokenColorings.xml
index 51d04f8..5105e77 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-DTD-tokenColorings.xml
@@ -20,12 +20,14 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
-</fontscolors>
+    <fontcolor name="dtd-eol" default="whitespace"/>
+    <fontcolor name="dtd-keyword" default="keyword" foreColor="ffe8bf6a"/>
+    <fontcolor name="dtd-ref" default="entity-reference"/>
+    <fontcolor name="dtd-target" default="default"/>
+    <fontcolor name="dtd-comment" default="comment"/>
+    <fontcolor name="dtd-symbol" default="operator" foreColor="ffe8bf6a"/>
+    <fontcolor name="dtd-plain" default="default"/>
+    <fontcolor name="dtd-error" default="error"/>
+    <fontcolor name="dtd-string" default="string"/>
+</fontscolors>
\ No newline at end of file
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Diff-tokenColorings.xml
old mode 100644
new mode 100755
similarity index 72%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Diff-tokenColorings.xml
index 51d04f8..472849f
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Diff-tokenColorings.xml
@@ -20,12 +20,12 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
+    <fontcolor name="added" foreColor="ff629755"/>
+    <fontcolor name="error" default="error"/>
+    <fontcolor name="filename" bgColor="ffe0e0e0"><font style="bold+italic"/></fontcolor>
+    <fontcolor name="header"><font style="bold"/></fontcolor>
+    <fontcolor name="index"><font style="bold"/></fontcolor>
+    <fontcolor name="plain"/>
+    <fontcolor name="removed" foreColor="ffd5756c"/>
 </fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-EL-tokenColorings.xml
old mode 100644
new mode 100755
similarity index 62%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-EL-tokenColorings.xml
index 51d04f8..62a0964
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-EL-tokenColorings.xml
@@ -20,12 +20,15 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
+    <fontcolor name="char-literal" default="string"/>
+    <fontcolor name="eol" default="default"/>
+    <fontcolor name="errors" default="error"/>
+    <fontcolor name="identifier" default="identifier"/>
+    <fontcolor name="keywords" default="keyword"><font style="bold"/></fontcolor>
+    <fontcolor name="numeric-literals" default="number"/>
+    <fontcolor name="operators" default="operator"/>
+    <fontcolor name="string" default="string"/>
+    <fontcolor name="tag-lib-prefix" default="default" foreColor="ffcc7832"><font style="bold"/></fontcolor>
+    <fontcolor name="whitespace" default="whitespace"/>
 </fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-HTML-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-HTML-tokenColorings.xml
new file mode 100644
index 0000000..75a403c
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-HTML-tokenColorings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="argument" default="markup-attribute"/>
+    <fontcolor name="block-comment" default="comment"/>
+    <fontcolor name="character" default="entity-reference" foreColor="ff6d9cbe"><font style="plain"/></fontcolor>
+    <fontcolor name="css-embedded" default="default"/>
+    <fontcolor name="el-content" default="default" foreColor="black"/>
+    <fontcolor name="el-delimiter" default="default"/>
+    <fontcolor name="error" default="error"/>
+    <fontcolor name="javascript-embedded" default="default"/>
+    <fontcolor name="mod-class" waveUnderlined="red"/>
+    <fontcolor name="mod-constructor" default="markup-attribute"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-method"><font style="bold"/></fontcolor>
+    <fontcolor name="operator" default="argument"/>
+    <fontcolor name="sgml-comment" default="comment"/>
+    <fontcolor name="sgml-declaration" default="default" foreColor="ff628fb5"/>
+    <fontcolor name="tag" default="markup-element"/>
+    <fontcolor name="text" default="default"/>
+    <fontcolor name="value" default="markup-attribute-value"/>
+    <fontcolor name="ws" default="whitespace"/>
+    <fontcolor name="xml-pi" default="default"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JSON-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JSON-tokenColorings.xml
new file mode 100644
index 0000000..c8c132b
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JSON-tokenColorings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="COMMENT" default="comment"/>
+    <fontcolor name="comment-line" default="comment"/>
+    <fontcolor name="COMMENT_HTML" default="comment" foreColor="ff9999ff"><font style="bold"/></fontcolor>
+    <fontcolor name="COMMENT_KEYWORD" default="comment"><font style="bold"/></fontcolor>
+    <fontcolor name="constant" default="number"/>
+    <fontcolor name="error" default="error"/>
+    <fontcolor name="identifier" default="identifier"/>
+    <fontcolor name="keyword" default="keyword"/>
+    <fontcolor name="mod-class" foreColor="black"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-field" default="field"/>
+    <fontcolor name="mod-global" foreColor="ff9f0d79"/>
+    <fontcolor name="mod-local-variable" default="identifier"/>
+    <fontcolor name="mod-local-variable-declaration" default="identifier"/>
+    <fontcolor name="mod-method" foreColor="black"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-regexp" default="regexp" foreColor="ff9933cc"/>
+    <fontcolor name="mod-unused" waveUnderlined="ff999999"/>
+    <fontcolor name="operator" default="operator"/>
+    <fontcolor name="separator" default="separator"/>
+    <fontcolor name="string" default="string"/>
+    <fontcolor name="whitespace" default="whitespace"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JSP-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JSP-tokenColorings.xml
new file mode 100755
index 0000000..1575c02
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JSP-tokenColorings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="attribute-name" default="default"/>
+    <fontcolor name="attribute-value" default="default" foreColor="ffa5c261"/>
+    <fontcolor name="comment" default="default" foreColor="gray"/>
+    <fontcolor name="endtag" default="default" foreColor="ffcc6932"><font style="bold"/></fontcolor>
+    <fontcolor name="error" default="default" foreColor="red"><font style="bold"/></fontcolor>
+    <fontcolor name="expression-language" default="default" bgColor="ff232525"/>
+    <fontcolor name="jsp-whitespace" default="default"><font style="bold"/></fontcolor>
+    <fontcolor name="scriptlet-delimiter" default="default" bgColor="ff303232"/>
+    <fontcolor name="scriptlet" default="default" bgColor="ff303232"/>
+    <fontcolor name="symbol" default="default"/>
+    <fontcolor name="tag-directive" default="default" foreColor="ffcc6932"><font style="bold"/></fontcolor>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-fontsColors.xml
deleted file mode 100644
index 096a1d3..0000000
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-fontsColors.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-
--->
-<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.2//EN" "http://netbeans.apache.org/dtds/EditorFontsColors-1_2.dtd">
-
-<fontscolors>
-    <colordef name="bg0_hard" color="1d2021"/>
-    <colordef name="bg0" color="282828"/>
-    <colordef name="bg1" color="3c3836"/>
-    <colordef name="bg2" color="504945"/>
-    <colordef name="bg3" color="665c54"/>
-    <colordef name="bg4" color="7c6f64"/>
-
-    <colordef name="gray" color="928374"/>
-
-    <colordef name="fg0" color="fbf1c7"/>
-    <colordef name="fg1" color="ebdbb2"/>
-    <colordef name="fg2" color="d5c4a1"/>
-    <colordef name="fg3" color="bdae93"/>
-    <colordef name="fg4" color="a89984"/>
-
-    <colordef name="red" color="fb4934"/>
-    <colordef name="green" color="b8bb26"/>
-    <colordef name="yellow" color="fabd2f"/>
-    <colordef name="blue" color="83a598"/>
-    <colordef name="purple" color="d3869b"/>
-    <colordef name="aqua" color="8ec07c"/>
-    <colordef name="orange" color="fe8019"/>
-
-    <!-- JavaTokenId categories -->
-    <fontcolor name="character" default="char"/>
-    <fontcolor name="identifier" default="identifier"/>
-    <fontcolor name="keyword" default="keyword"/>
-    <fontcolor name="literal" default="keyword" />
-    <fontcolor name="comment" default="comment"/>
-    <fontcolor name="number" default="number"/>
-    <fontcolor name="operator" default="operator"/>
-    <fontcolor name="string" default="string"/>
-    <fontcolor name="separator" default="separator"/>
-    <fontcolor name="whitespace" default="whitespace"/>
-    
-    <fontcolor name="keyword-directive" default="keyword"/>
-    
-    <!--"semantic" highlighting:-->
-    <fontcolor name="mod-unused" waveUnderlined="orange"/>
-    <fontcolor name="mod-abstract" />
-    
-    <fontcolor name="mod-field-declaration" default="field"/>    
-    <fontcolor name="mod-local-variable-declaration" default="identifier"/>    
-    <fontcolor name="mod-parameter-declaration" default="identifier"/>
-    
-    <fontcolor name="mod-method-declaration" default="method">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="mod-constructor-declaration" default="constructor">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="mod-module-declaration" default="identifier">
-            <font style="bold" />
-    </fontcolor>
-    <fontcolor name="mod-class-declaration" default="identifier">
-            <font style="bold" />
-    </fontcolor>
-    <fontcolor name="mod-interface-declaration" default="identifier">
-            <font style="bold" />
-    </fontcolor>
-    <fontcolor name="mod-annotation-type-declaration" default="identifier">
-                <font style="bold" />
-    </fontcolor>
-    <fontcolor name="mod-enum-declaration" default="identifier">
-        <font style="bold" />
-    </fontcolor>
-    
-    <fontcolor name="mod-field" default="field"/>        
-    <fontcolor name="mod-local-variable" default="identifier"/>
-    <fontcolor name="mod-parameter" default="identifier"/>
-    <fontcolor name="mod-method" default="method"/>
-    <fontcolor name="mod-constructor" default="constructor"/>
-    <fontcolor name="mod-module" default="identifier"/>
-    <fontcolor name="mod-class" default="identifier"/>
-    <fontcolor name="mod-interface" default="identifier"/>
-    <fontcolor name="mod-annotation-type" default="identifier"/>
-    <fontcolor name="mod-enum" default="identifier"/>
-    
-    
-    <fontcolor name="mod-deprecated" strikeThrough="black"/>    
-    <fontcolor name="mod-static" >
-        <font style="italic" />
-    </fontcolor>    
-    <fontcolor name="mod-private" />
-    <fontcolor name="mod-package-private" />
-    <fontcolor name="mod-protected" />
-    <fontcolor name="mod-public" />
-    <fontcolor name="mod-keyword" default="keyword" />
-    <fontcolor name="mod-unindented-text-block" bgColor="EEDDDD" />
-    
-    <!-- JavaStringTokenId categories -->
-    <fontcolor name="string-escape" default="string">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="string-escape-invalid" waveUnderlined="red" default="string">
-        <font style="bold" />
-    </fontcolor>
-    
-    <!-- JavaCharacterTokenId categories -->
-    <fontcolor name="character-escape" default="character">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="character-escape-invalid" default="character">
-        <font style="italic" />
-    </fontcolor>
-   
-    <!-- JavadocTokenId categories -->
-    <fontcolor name="javadoc-tag" default="comment">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="html-tag" default="comment" foreColor="9999FF">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="javadoc-first-sentence" default="comment">
-        <font style="bold" />
-    </fontcolor>
-
-    <fontcolor name="javadoc-identifier" default="comment" foreColor="000000" >
-    </fontcolor>
-
-</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-tokenColorings.xml
new file mode 100644
index 0000000..5c1e25e
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-tokenColorings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="character" default="char"/>
+    <fontcolor name="character-escape" default="character"><font style="bold"/></fontcolor>
+    <fontcolor name="character-escape-invalid" default="character"><font style="italic"/></fontcolor>
+    <fontcolor name="comment" default="comment"/>
+    <fontcolor name="html-tag" default="comment" foreColor="ff9999ff"><font style="italic"/></fontcolor>
+    <fontcolor name="identifier" default="identifier"/>
+    <fontcolor name="javadoc-first-sentence" default="comment"/>
+    <fontcolor name="javadoc-identifier" default="comment" foreColor="ff8a653b"/>
+    <fontcolor name="javadoc-tag" default="comment"><font style="bold"/></fontcolor>
+    <fontcolor name="keyword" default="keyword"/>
+    <fontcolor name="keyword-directive" default="keyword"/>
+    <fontcolor name="literal" default="keyword"/>
+    <fontcolor name="mod-abstract"/>
+    <fontcolor name="mod-annotation-type" default="identifier"/>
+    <fontcolor name="mod-annotation-type-declaration" default="identifier"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-class" default="identifier"/>
+    <fontcolor name="mod-class-declaration" default="identifier"/>
+    <fontcolor name="mod-constructor" default="identifier"/>
+    <fontcolor name="mod-constructor-declaration" default="identifier"/>
+    <fontcolor name="mod-deprecated" strikeThrough="ffc3c3c3"/>
+    <fontcolor name="mod-enum" default="identifier"/>
+    <fontcolor name="mod-enum-declaration" default="identifier"/>
+    <fontcolor name="mod-field" default="field"/>
+    <fontcolor name="mod-field-declaration" default="field"/>
+    <fontcolor name="mod-interface" default="identifier"/>
+    <fontcolor name="mod-interface-declaration" default="identifier"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-local-variable" default="identifier"/>
+    <fontcolor name="mod-local-variable-declaration" default="identifier"/>
+    <fontcolor name="mod-method" default="method"/>
+    <fontcolor name="mod-method-declaration" default="method" foreColor="ffffc66d"/>
+    <fontcolor name="mod-package-private"/>
+    <fontcolor name="mod-parameter" default="identifier"/>
+    <fontcolor name="mod-parameter-declaration" default="identifier"/>
+    <fontcolor name="mod-private"/>
+    <fontcolor name="mod-protected"/>
+    <fontcolor name="mod-public"/>
+    <fontcolor name="mod-static"><font style="italic"/></fontcolor>
+    <fontcolor name="mod-unused" foreColor="gray" waveUnderlined="gray"/>
+    <fontcolor name="number" default="number"/>
+    <fontcolor name="operator" default="operator"/>
+    <fontcolor name="separator" default="separator"/>
+    <fontcolor name="string" default="string"/>
+    <fontcolor name="string-escape" default="string" foreColor="ffcc7832"/>
+    <fontcolor name="string-escape-invalid" default="string" waveUnderlined="red"/>
+    <fontcolor name="whitespace" default="whitespace"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JavaScript-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JavaScript-tokenColorings.xml
new file mode 100644
index 0000000..37ce15b
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-JavaScript-tokenColorings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="COMMENT" default="comment"/>
+    <fontcolor name="comment-line" default="comment"/>
+    <fontcolor name="COMMENT_HTML" default="comment" foreColor="ff9999ff"><font style="bold"/></fontcolor>
+    <fontcolor name="COMMENT_KEYWORD" default="comment"><font style="bold"/></fontcolor>
+    <fontcolor name="constant" default="number"/>
+    <fontcolor name="error" default="error"/>
+    <fontcolor name="identifier" default="identifier"/>
+    <fontcolor name="keyword" default="keyword"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-class"/>
+    <fontcolor name="mod-field" default="field"/>
+    <fontcolor name="mod-global"/>
+    <fontcolor name="mod-local-variable" default="identifier"/>
+    <fontcolor name="mod-local-variable-declaration" default="identifier"/>
+    <fontcolor name="mod-method" foreColor="ffffc66d"/>
+    <fontcolor name="mod-regexp" default="regexp" foreColor="ff6a8759"/>
+    <fontcolor name="mod-unused" waveUnderlined="ff999999"/>
+    <fontcolor name="operator" default="operator"/>
+    <fontcolor name="separator" default="separator"/>
+    <fontcolor name="string" default="string"/>
+    <fontcolor name="whitespace" default="whitespace"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Markdown-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Markdown-tokenColorings.xml
new file mode 100755
index 0000000..04cd474
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Markdown-tokenColorings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name='abbreviation'/>
+    <fontcolor name='anchorlink' default='link'/>
+    <fontcolor name='autolink' default='link'/>
+    <fontcolor name='blockquote' default='comment'/>
+    <fontcolor name='bulletlist' default='keyword' foreColor="ff339900"/>
+    <fontcolor name='code' default='comment'/>
+    <fontcolor name='definition_list' default='keyword'/>
+    <fontcolor name='definition_term' default='keyword'/>
+    <fontcolor name='definition' default='keyword'/>
+    <fontcolor name='emph'><font style="italic"/></fontcolor>
+    <fontcolor name='expimage' default='image'/>
+    <fontcolor name='explink' default='link'/>
+    <fontcolor name='header' default='keyword' foreColor="ff990099"><font style="bold"/></fontcolor>
+    <fontcolor name='header1' default='header'/>
+    <fontcolor name='header2' default='header' foreColor="ff900090"/>
+    <fontcolor name='header3' default='header' foreColor="ff800080"/>
+    <fontcolor name='header4' default='header' foreColor="ff780078"/>
+    <fontcolor name='header5' default='header' foreColor="ff760076"/>
+    <fontcolor name='header6' default='header' foreColor="ff740074"/>
+    <fontcolor name='horizontalrule' default='separator'/>
+    <fontcolor name='htmlblock' default='string'/>
+    <fontcolor name='image' default='keyword'/>
+    <fontcolor name='inlinehtml' default='keyword'/>
+    <fontcolor name='link' default='keyword'/>
+    <fontcolor name='listitem' default='keyword'/>
+    <fontcolor name='maillink' default='link'/>
+    <fontcolor name='orderedlist' default='keyword'  foreColor="ff339900"/>
+    <fontcolor name='plain'/>
+    <fontcolor name='quoted' default='keyword'/>
+    <fontcolor name='ref_image' default='image'/>
+    <fontcolor name='ref_link' default='link'/>
+    <fontcolor name='reference' default='keyword'/>
+    <fontcolor name='strikethrough' strikeThrough="black"/>
+    <fontcolor name='strong'><font style="bold"/></fontcolor>
+    <fontcolor name='table' default='string'/>
+    <fontcolor name='verbatim' default='comment'/>
+    <fontcolor name='whitespace' default='whitespace'/>
+    <fontcolor name='wikilink' default='link'/>
+</fontscolors>
\ No newline at end of file
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-PHP-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-PHP-tokenColorings.xml
new file mode 100755
index 0000000..4c620df
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-PHP-tokenColorings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="comment" default="comment"/>
+    <fontcolor name="commentline" default="comment"/>
+    <fontcolor name="constant" default="constant"><font style="italic"/></fontcolor>
+    <fontcolor name="covered" default="covered"/>
+    <fontcolor name="heredocdelimiter"/>
+    <fontcolor name="htmltag" default="comment" foreColor="ff9999ff"><font style="bold"/></fontcolor>
+    <fontcolor name="identifier" default="identifier"/>
+    <fontcolor name="inferred" default="inferred"/>
+    <fontcolor name="keyword" default="keyword"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-annotation-type" default="comment"><font style="bold"/></fontcolor>
+    <fontcolor name="mod-class"/>
+    <fontcolor name="mod-custom1" default="method"/>
+    <fontcolor name="mod-deprecated" strikeThrough="black"/>
+    <fontcolor name="mod-field" default="field"/>
+    <fontcolor name="mod-method" default="method" foreColor="ffffc66d"/>
+    <fontcolor name="mod-static"><font style="italic"/></fontcolor>
+    <fontcolor name="mod-unused" waveUnderlined="ff999999"/>
+    <fontcolor name="number" default="number"/>
+    <fontcolor name="operator" default="operator"/>
+    <fontcolor name="partial" default="partial"/>
+    <fontcolor name="phpdockeyword" default="comment"><font style="bold"/></fontcolor>
+    <fontcolor name="phpopenclose" default="separator" foreColor="ffcc7832"><font style="bold"/></fontcolor>
+    <fontcolor name="separator" default="separator"/>
+    <fontcolor name="string" default="string"/>
+    <fontcolor name="uncovered" default="uncovered"/>
+    <fontcolor name="variable" foreColor="ff9876aa"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Properties-tokenColorings.xml
similarity index 82%
rename from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
rename to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Properties-tokenColorings.xml
index 51d04f8..eb849bf 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Properties-tokenColorings.xml
@@ -20,12 +20,10 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
+    <fontcolor name="properties-equal-sign" default="operator" foreColor="gray"/>
+    <fontcolor name="properties-key" default="default" foreColor="ffcc7832"/>
     <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
+    <fontcolor name="properties-text" default="default"><font style="bold"/></fontcolor>
     <fontcolor name="properties-value" default="string"/>
 </fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-SQL-tokenColorings.xml
similarity index 60%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-SQL-tokenColorings.xml
index 51d04f8..87c094e 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-SQL-tokenColorings.xml
@@ -20,12 +20,17 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
+    <fontcolor name="default" default="default"/>
+    <fontcolor name="sql-block-comment" default="comment"/>
+    <fontcolor name="sql-dot" default="operator"/>
+    <fontcolor name="sql-double-literal" default="number"/>
+    <fontcolor name="sql-errors" default="error"/>
+    <fontcolor name="sql-identifier" default="field"/>
+    <fontcolor name="sql-int-literal" default="number"/>
+    <fontcolor name="sql-keyword" default="keyword"/>
+    <fontcolor name="sql-line-comment" default="comment"/>
+    <fontcolor name="sql-operator" default="operator"/>
+    <fontcolor name="sql-string-literal" default="string"/>
+    <fontcolor name="sql-whitespace" default="whitespace"/>
 </fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-TPL-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-TPL-tokenColorings.xml
new file mode 100755
index 0000000..8fedc06
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-TPL-tokenColorings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="argument_value" default="smarty" foreColor="ffc67300"/>
+    <fontcolor name="argument" default="smarty" foreColor="ff4757b7"/>
+    <fontcolor name="comment" default="smarty" foreColor="ff969696"/>
+    <fontcolor name="config_variable" default="smarty" foreColor="red"/>
+    <fontcolor name="error" waveUnderlined="red"/>
+    <fontcolor name="other" default="smarty"/>
+    <fontcolor name="php_variable" default="smarty" foreColor="ff6d3206"/>
+    <fontcolor name="pipe" default="smarty" foreColor="ffff9300"><font style="bold"/></fontcolor>
+    <fontcolor name="smarty_delimiter" default="smarty" foreColor="fff8bb00"><font style="bold"/></fontcolor>
+    <fontcolor name="smarty_function" default="smarty" foreColor="ff2c9c25"><font style="bold"/></fontcolor>
+    <fontcolor name="smarty_operator" default="smarty" foreColor="magenta"/>
+    <fontcolor name="smarty" default="default" bgColor="fffffec9"/>
+    <fontcolor name="string" default="smarty" foreColor="ffce7b00"/>
+    <fontcolor name="variable_modifier" default="smarty" foreColor="ffff7700"/>
+    <fontcolor name="whitespace" default="smarty"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Tag-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Tag-tokenColorings.xml
new file mode 100755
index 0000000..0a1d15f
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Tag-tokenColorings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="attribute-name" default="default"/>
+    <fontcolor name="attribute-value" default="default" foreColor="ffa5c261"/>
+    <fontcolor name="comment" default="default" foreColor="gray"><font style="bold"/></fontcolor>
+    <fontcolor name="endtag" default="default" foreColor="ffcc6932"><font style="bold"/></fontcolor>
+    <fontcolor name="error" default="default" foreColor="red"><font style="bold"/></fontcolor>
+    <fontcolor name="expression-language" default="default" bgColor="ff232525"/>
+    <fontcolor name="jsp-whitespace" default="default"><font style="bold"/></fontcolor>
+    <fontcolor name="scriptlet-delimiter" default="default" bgColor="ff303232"/>
+    <fontcolor name="scriptlet" default="default" bgColor="ff303232"/>
+    <fontcolor name="symbol" default="default"><font style="bold"/></fontcolor>
+    <fontcolor name="tag-directive" default="default" foreColor="ffcc6932"><font style="bold"/></fontcolor>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XHTML-tokenColorings.xml
similarity index 77%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XHTML-tokenColorings.xml
index 51d04f8..23a0e00 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XHTML-tokenColorings.xml
@@ -20,12 +20,6 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
+    <fontcolor name="expression-language" default="default" bgColor="ff232525"/>
 </fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XML-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XML-tokenColorings.xml
new file mode 100644
index 0000000..0bac5c8
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XML-tokenColorings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="xml-attribute" default="markup-attribute"/>
+    <fontcolor name="xml-cdata-section" default="default"/>
+    <fontcolor name="xml-comment" default="comment"/>
+    <fontcolor name="xml-doctype" default="default" foreColor="ffe8bf6a"/>
+    <fontcolor name="xml-EOL" default="whitespace"/>
+    <fontcolor name="xml-error" default="error"/>
+    <fontcolor name="xml-operator" default="operator" foreColor="ff6a8759"/>
+    <fontcolor name="xml-pi-content" default="default" foreColor="ff00007c"/>
+    <fontcolor name="xml-pi-end" default="default" foreColor="ffe8bf6a"/>
+    <fontcolor name="xml-pi-start" default="default" foreColor="ffe8bf6a"/>
+    <fontcolor name="xml-pi-target" default="default"/>
+    <fontcolor name="xml-ref" default="entity-reference"/>
+    <fontcolor name="xml-tag" default="markup-element"/>
+    <fontcolor name="xml-text" default="default"/>
+    <fontcolor name="xml-value" default="default" foreColor="ff6a8759"/>
+    <fontcolor name="xml-ws" default="whitespace"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XMLexternalentity-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XMLexternalentity-tokenColorings.xml
new file mode 100755
index 0000000..e5954ac
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-XMLexternalentity-tokenColorings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="xml-attribute" default="markup-attribute"/>
+    <fontcolor name="xml-cdata-section" default="default" foreColor="ff7c6200"/>
+    <fontcolor name="xml-comment" default="comment"/>
+    <fontcolor name="xml-doctype" default="default" foreColor="ff00007c"><font style="bold"/></fontcolor>
+    <fontcolor name="xml-EOL" default="whitespace"/>
+    <fontcolor name="xml-error" default="error"/>
+    <fontcolor name="xml-operator" default="operator"/>
+    <fontcolor name="xml-pi-content" default="default" foreColor="ff00007c"/>
+    <fontcolor name="xml-pi-end" default="default" foreColor="ff00007c"><font style="bold"/></fontcolor>
+    <fontcolor name="xml-pi-start" default="default" foreColor="ff00007c"><font style="bold"/></fontcolor>
+    <fontcolor name="xml-pi-target" default="default" foreColor="ff00007c"><font style="bold"/></fontcolor>
+    <fontcolor name="xml-ref" default="entity-reference"/>
+    <fontcolor name="xml-tag" default="markup-element"/>
+    <fontcolor name="xml-text" default="default"/>
+    <fontcolor name="xml-value" default="default" foreColor="ffce7b00"/>
+    <fontcolor name="xml-ws" default="whitespace"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-YAML-tokenColorings.xml
old mode 100644
new mode 100755
similarity index 62%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-YAML-tokenColorings.xml
index 51d04f8..e50f89a
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-YAML-tokenColorings.xml
@@ -20,12 +20,13 @@
 
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
-
 <fontscolors>
-    <fontcolor name="properties-line-comment" default="comment"/>
-    <fontcolor name="properties-equal-sign" default="operator"/>
-    <fontcolor name="properties-key" default="field">
-        <font style="bold"/>
-    </fontcolor>
-    <fontcolor name="properties-value" default="string"/>
-</fontscolors>
+    <fontcolor name="comment" default="comment"/>
+    <fontcolor name="mod-method" default="keyword"><font style="bold" /></fontcolor>
+    <fontcolor name="mustache-delimiter" default="default" foreColor="ff6a8759"><font style="bold"/></fontcolor>
+    <fontcolor name="mustache" default="default" foreColor="ff6a8759"/>
+    <fontcolor name="ruby-delimiter" default="default" foreColor="ff6a8759"><font style="bold"/></fontcolor>
+    <fontcolor name="ruby" default="default" foreColor="ff6a8759"/>
+    <fontcolor name="RUBYCOMMENT" default="comment" bgColor="ffe3f2e1"/>
+    <fontcolor name="whitespace" default="whitespace"/>
+</fontscolors>
\ No newline at end of file
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-annotations.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-annotations.xml
new file mode 100644
index 0000000..27b1583
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-annotations.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="Breakpoint" bgColor="ff4B1919"/>
+    <fontcolor name="Breakpoint_broken" bgColor="ff372B2B"/>
+    <fontcolor name="Breakpoint_stroke" bgColor="ff372B2B"/>
+    <fontcolor name="CallSite" bgColor="ff796977"/>
+    <fontcolor name="ClassBreakpoint"/>
+    <fontcolor name="ClassBreakpoint_stroke"/>
+    <fontcolor name="CondBreakpoint" bgColor="ff4B1919"/>
+    <fontcolor name="CondBreakpoint_broken" bgColor="ff372B2B"/>
+    <fontcolor name="CondBreakpoint_stroke" bgColor="ff372B2B"/>
+    <fontcolor name="CurrentExpression" bgColor="ffd1ffbc"/>
+    <fontcolor name="CurrentExpressionLine" bgColor="ff1E501C"/>
+    <fontcolor name="CurrentExpressionLine_BP" bgColor="ff1E501C"/>
+    <fontcolor name="CurrentExpressionLine_CBP" bgColor="ff1E501C"/>
+    <fontcolor name="CurrentExpressionLine_DBP" bgColor="ff1E501C"/>
+    <fontcolor name="CurrentExpressionLine_DCBP" bgColor="ff1E501C"/>
+    <fontcolor name="CurrentPC" bgColor="ff283C26"/>
+    <fontcolor name="CurrentPC2" bgColor="ff283C26"/>
+    <fontcolor name="CurrentPC2_BP" bgColor="ff4B1919"/>
+    <fontcolor name="CurrentPC2_DBP" bgColor="ff372B2B"/>
+    <fontcolor name="CurrentPC2LinePart" bgColor="ff283C26"/>
+    <fontcolor name="CurrentPCLinePart" bgColor="ff283C26"/>
+    <fontcolor name="Dbx_Bpt" bgColor="ff3a2323"/>
+    <fontcolor name="Dbx_Bpt_broken" bgColor="ff4B1919"/>
+    <fontcolor name="Dbx_Bpt_broken_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_cmpx" bgColor="ff4B1919"/>
+    <fontcolor name="Dbx_Bpt_cmpx_broken" bgColor="ff4B1919"/>
+    <fontcolor name="Dbx_Bpt_cmpx_broken_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_cmpx_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_cmpx_hit" bgColor="ff283C26"/>
+    <fontcolor name="Dbx_Bpt_cmpx_hit_broken" bgColor="ff283C26"/>
+    <fontcolor name="Dbx_Bpt_cmpx_hit_broken_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_cmpx_hit_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_compound" bgColor="ff4B1919"/>
+    <fontcolor name="Dbx_Bpt_compound_hit" bgColor="ff283C26"/>
+    <fontcolor name="Dbx_Bpt_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_hit" bgColor="ff283C26"/>
+    <fontcolor name="Dbx_Bpt_hit_broken" bgColor="ff283C26"/>
+    <fontcolor name="Dbx_Bpt_hit_broken_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_Bpt_hit_dis" bgColor="ff372B2B"/>
+    <fontcolor name="Dbx_PC" bgColor="ff283C26"/>
+    <fontcolor name="debugger-mixed_BP" bgColor="ff4B1919"/>
+    <fontcolor name="debugger-mixed_BP_broken" bgColor="ff372B2B"/>
+    <fontcolor name="debugger-multi_BPCBP" bgColor="ff4B1919"/>
+    <fontcolor name="debugger-multi_BPCBP_broken" bgColor="ff372B2B"/>
+    <fontcolor name="debugger-multi_DBPCBP" bgColor="ff372B2B"/>
+    <fontcolor name="debugger-PC_BP" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_BP_broken" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_BP_stroke" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_CBP" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_CBP_broken" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_CBP_stroke" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_DBP" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_DBP_stroke" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_DCBP" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_DCBP_stroke" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_mixedBP" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_mixedBP_broken" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_multi_BPCBP" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_multi_BPCBP_broken" bgColor="ff283C26"/>
+    <fontcolor name="debugger-PC_multi_DBPCBP" bgColor="ff283C26"/>
+    <fontcolor name="DisabledBreakpoint" bgColor="ff372B2B"/>
+    <fontcolor name="DisabledBreakpoint_stroke" bgColor="ff372B2B"/>
+    <fontcolor name="DisabledClassBreakpoint"/>
+    <fontcolor name="DisabledClassBreakpoint_stroke"/>
+    <fontcolor name="DisabledCondBreakpoint" bgColor="ff372B2B"/>
+    <fontcolor name="DisabledCondBreakpoint_stroke" bgColor="ff372B2B"/>
+    <fontcolor name="DisabledFieldBreakpoint"/>
+    <fontcolor name="DisabledFieldBreakpoint_stroke"/>
+    <fontcolor name="DisabledMethodBreakpoint"/>
+    <fontcolor name="DisabledMethodBreakpoint_stroke"/>
+    <fontcolor name="editor-bookmark"/>
+    <fontcolor name="FieldBreakpoint"/>
+    <fontcolor name="FieldBreakpoint_stroke"/>
+    <fontcolor name="loadgenProfilingPoint" bgColor="ff508098"/>
+    <fontcolor name="loadgenProfilingPointD" bgColor="ff2B2B41"/>
+    <fontcolor name="MethodBreakpoint"/>
+    <fontcolor name="MethodBreakpoint_stroke"/>
+    <fontcolor name="org-netbeans-modules-cnd-cpp-parser_annotation_err" waveUnderlined="red"/>
+    <fontcolor name="org-netbeans-modules-cnd-highligh-semantic-markoccurrences"/>
+    <fontcolor name="org-netbeans-modules-cnd-highlight-security-error"/>
+    <fontcolor name="org-netbeans-modules-cnd-highlight-security-warning"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-extended_is_specialized"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-extended_specializes"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-is_overridden"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-is_overridden_combined"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-is_overridden_combined_pseudo"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-is_overridden_pseudo"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-is_specialized"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-overrides"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-overrides_pseudo"/>
+    <fontcolor name="org-netbeans-modules-cnd-navigation-specializes"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-has_implementations"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-implements"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-implements-has-implementations-combined"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-implements-is-overridden-combined"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-intercepted"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-is_overridden"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-override-is-overridden-combined"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-overrides"/>
+    <fontcolor name="org-netbeans-modules-git-Annotation"/>
+    <fontcolor name="org-netbeans-modules-git-remote-Annotation"/>
+    <fontcolor name="org-netbeans-modules-mercurial-Annotation"/>
+    <fontcolor name="org-netbeans-modules-mercurial-remote-Annotation"/>
+    <fontcolor name="org-netbeans-modules-subversion-Annotation"/>
+    <fontcolor name="org-netbeans-modules-subversion-remote-Annotation"/>
+    <fontcolor name="org-netbeans-modules-tomcat5-error" bgColor="ffff8080"/>
+    <fontcolor name="org-netbeans-modules-versioning-annotate-Annotation"/>
+    <fontcolor name="org-netbeans-modules-web-beans-annotations-decorated-bean"/>
+    <fontcolor name="org-netbeans-modules-web-beans-annotations-delegate-point"/>
+    <fontcolor name="org-netbeans-modules-web-beans-annotations-event"/>
+    <fontcolor name="org-netbeans-modules-web-beans-annotations-injection-point"/>
+    <fontcolor name="org-netbeans-modules-web-beans-annotations-observer"/>
+    <fontcolor name="org-netbeans-modules-web-core-syntax-JspParserErrorAnnotation" waveUnderlined="red"/>
+    <fontcolor name="org-netbeans-modules-xml-error" bgColor="ffffa0a0"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err_fixable"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint_fixable"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo" foreColor="ffa8c023"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo_fixable" foreColor="ffa8c023"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier_fixable"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn_fixable"/>
+    <fontcolor name="OtherThread"/>
+    <fontcolor name="OtherThread_BP" bgColor="ff4B1919"/>
+    <fontcolor name="OtherThread_BP_broken" bgColor="ff283C26"/>
+    <fontcolor name="OtherThread_DBP" bgColor="ff372B2B"/>
+    <fontcolor name="OtherThread_PC" bgColor="ff283C26"/>
+    <fontcolor name="OtherThread_PC_BP" bgColor="ff283C26"/>
+    <fontcolor name="OtherThreads"/>
+    <fontcolor name="OtherThreads_BP" bgColor="ff4B1919"/>
+    <fontcolor name="OtherThreads_BP_broken" bgColor="ff283C26"/>
+    <fontcolor name="OtherThreads_DBP" bgColor="ff372B2B"/>
+    <fontcolor name="OtherThreads_PC_BP" bgColor="ff283C26"/>
+    <fontcolor name="PHPError" waveUnderlined="red"/>
+    <fontcolor name="PHPNotice" waveUnderlined="ffc0c000"/>
+    <fontcolor name="PHPWarning" waveUnderlined="ffc0c000"/>
+    <fontcolor name="resetResultsProfilingPoint" bgColor="ff508098"/>
+    <fontcolor name="resetResultsProfilingPointD" bgColor="ff2B2B41"/>
+    <fontcolor name="stopwatchProfilingPoint" bgColor="ff508098"/>
+    <fontcolor name="stopwatchProfilingPointD" bgColor="ff2B2B41"/>
+    <fontcolor name="takeSnapshotProfilingPoint" bgColor="ff508098"/>
+    <fontcolor name="takeSnapshotProfilingPointD" bgColor="ff2B2B41"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-editor.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-editor.xml
deleted file mode 100644
index 92d1670..0000000
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-editor.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-
--->
-<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.2//EN" "http://netbeans.apache.org/dtds/EditorFontsColors-1_2.dtd">
-
-<fontscolors>
-    <colordef name="bg0_hard" color="1d2021"/>
-
-
-    
-    <colordef name="fg2" color="d5c4a1"/>
-    <colordef name="fg3" color="bdae93"/>
-
-    <colordef name="purple" color="d3869b"/>
-    <!-- defined -->
-    <colordef name="bg0" color="2b2b2b"/>
-    <colordef name="bg1" color="323232"/>
-    <colordef name="bg2" color="888888"/>
-    <colordef name="bg3" color="214283"/>
-    <colordef name="bg4" color="3b514d"/>
-    <colordef name="bg5" color="313335"/>
-
-    <colordef name="fg0" color="a9b7c6"/>
-    <colordef name="fg1" color="bbbbbb"/>
-    <colordef name="fg4" color="888888"/>
-    <colordef name="fg5" color="555555"/>
-
-    <colordef name="red" color="9e2927"/>
-    <colordef name="green" color="32593D"/>
-    <colordef name="blue" color="6897bb"/>
-    <colordef name="yellow" color="e8bf6a"/>
-    <colordef name="orange" color="cc7832"/>
-    <colordef name="levander" color="9876aa"/>
-
-    <fontcolor name="default" foreColor="fg0" bgColor="bg0"/>
-
-    <fontcolor name="code-folding" foreColor="8c8c8c"/>
-    <fontcolor name="code-folding-bar" foreColor="8c8c8c"/>
-    <fontcolor name="highlight-caret-row" bgColor="bg1"/>
-    <fontcolor name="nbeditor-bracesMatching-match" foreColor="yellow" bgColor="bg4"/>
-    <fontcolor name="nbeditor-bracesMatching-match-multichar" bgColor="bg4"/>
-    <fontcolor name="nbeditor-bracesMatching-mismatch" bgColor="red"/>
-    <fontcolor name="nbeditor-bracesMatching-mismatch-multichar" bgColor="red"/>
-    <fontcolor name="line-number" foreColor="fg4" bgColor="bg5"/>
-    <fontcolor name="selection" bgColor="bg3"/>
-    <fontcolor name="text-limit-line-color" foreColor="fg5"/>
-    <fontcolor name="hyperlinks" foreColor="287BDE" underline="287BDE"/>
-    <fontcolor name="indent-guide-lines" foreColor="404040"/>
-    <fontcolor name="caret-color-insert-mode" foreColor="fg1"/>
-    <fontcolor name="caret-color-overwrite-mode" foreColor="fg1"/>
-    <fontcolor name="nbeditor-bracesMatching-sidebar" foreColor="blue"/>
-    <fontcolor name="indent-whitespace"/>
-    <fontcolor name="trailing-whitespace"/>
-    <fontcolor name="highlight-search" bgColor="green"/>
-    <fontcolor name="block-search" foreColor="black" bgColor="E0E8F1"/>
-    <fontcolor name="inc-search" bgColor="FFB442"/>
-
-    <fontcolor name="guarded" bgColor="bg1"/>
-    <fontcolor name="readonly-files" bgColor="bg1"/>
-    <fontcolor name="status-bar"/>
-    <fontcolor name="status-bar-bold" foreColor="red"/>
-
-    <fontcolor name="synchronized-text-blocks-ext" foreColor="CC0099"/>
-    <fontcolor name="synchronized-text-blocks-ext-slave" foreColor="996600"/>
-</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-fontsColorsDefaults.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-fontsColorsDefaults.xml
deleted file mode 100644
index 64894ca..0000000
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-fontsColorsDefaults.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-
--->
-
-<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.2//EN" "http://netbeans.apache.org/dtds/EditorFontsColors-1_2.dtd">
-
-<fontscolors>
-    <colordef name="bg0_hard" color="1d2021"/>
-
-
-    <colordef name="fg1" color="ebdbb2"/>
-    <colordef name="fg2" color="d5c4a1"/>
-    <colordef name="fg3" color="bdae93"/>
-
-    <colordef name="purple" color="d3869b"/>
-    <!-- defined -->
-    <colordef name="bg0" color="2b2b2b"/>
-    <colordef name="bg1" color="323232"/>
-    <colordef name="bg2" color="888888"/>
-    <colordef name="bg3" color="214283"/>
-    <colordef name="bg4" color="3b514d"/>
-
-    <colordef name="fg0" color="a9b7c6"/>
-    <colordef name="fg4" color="888888"/>
-
-    <colordef name="red" color="9e2927"/>
-    <colordef name="green" color="6a8759"/>
-    <colordef name="blue" color="6897bb"/>
-    <colordef name="yellow" color="e8bf6a"/>
-    <colordef name="orange" color="cc7832"/>
-    <colordef name="levander" color="9876aa"/>
-
-    <fontcolor name="default" foreColor="fg0" bgColor="bg0"/>
-
-    <!-- syntax colorings -->
-
-    <fontcolor name="char" foreColor="green"/>
-    <fontcolor name="comment" foreColor="gray">
-        <font style="italic"/>
-    </fontcolor>
-    <fontcolor name="error" waveUnderlined="red"/>
-    <fontcolor name="identifier"/>
-    <fontcolor name="keyword" foreColor="orange"/>
-    <fontcolor name="number" foreColor="purple"/>
-    <fontcolor name="operator" foreColor="fg1"/>
-    <fontcolor name="string" foreColor="green"/>
-    <fontcolor name="whitespace"/>
-
-    <fontcolor name="markup-element"/>
-    <fontcolor name="markup-attribute" foreColor="levander"/>
-    <fontcolor name="markup-attribute-value" foreColor="green"/>
-    <fontcolor name="entity-reference" foreColor="cyan"/>
-    <fontcolor name="mark-occurrences" bgColor="bg3"/>
-
-    <!-- semantic colorings -->
-
-    <fontcolor name="constructor" foreColor="levander">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="method" foreColor="levander">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="field" foreColor="blue">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="local-variable" />
-    <fontcolor name="method-parameter"/>
-
-    <fontcolor name="class" foreColor="orange"/>
-    <fontcolor name="interface" foreColor="orange" />
-    <fontcolor name="enum" foreColor="orange" />
-
-    <fontcolor name="unused" foreColor="gray"/>
-    <fontcolor name="deprecated" strikeThrough="gray" />
-    <fontcolor name="abstract" />
-    <fontcolor name="static" foreColor="orange"/>
-    <fontcolor name="private" foreColor="red"/>
-    <fontcolor name="protected" foreColor="red"/>
-    <fontcolor name="public" />
-    
-</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml
new file mode 100644
index 0000000..0ef078f
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="block-search" foreColor="black" bgColor="ffe0e8f1"/>
+    <fontcolor name="caret-color-insert-mode" foreColor="ffbbbbbb"/>
+    <fontcolor name="caret-color-overwrite-mode" foreColor="ffbbbbbb"/>
+    <fontcolor name="code-folding" foreColor="ff8c8c8c" bgColor="ff3a3a3a"/>
+    <fontcolor name="code-folding-bar" foreColor="ff666666"/>
+    <fontcolor name="code-folding-border" foreColor="ff666666"/>
+    <fontcolor name="guarded" bgColor="ff323232"/>
+    <fontcolor name="highlight-caret-row" bgColor="ff323232"/>
+    <fontcolor name="highlight-search" bgColor="ff32593d"/>
+    <fontcolor name="hyperlinks" foreColor="ff287bde" underline="ff287bde"/>
+    <fontcolor name="inc-search" foreColor="black" bgColor="ffffb442"/>
+    <fontcolor name="indent-guide-lines" foreColor="darkGray"/>
+    <fontcolor name="indent-whitespace"/>
+    <fontcolor name="line-number" foreColor="ff888888" bgColor="ff313335"/>
+    <fontcolor name="nbeditor-bracesMatching-match" foreColor="ffffef28" bgColor="ff3b514d"/>
+    <fontcolor name="nbeditor-bracesMatching-match-multichar" bgColor="ff3b514d"/>
+    <fontcolor name="nbeditor-bracesMatching-mismatch" bgColor="ffd1243b"/>
+    <fontcolor name="nbeditor-bracesMatching-mismatch-multichar" bgColor="ffd1243b"/>
+    <fontcolor name="nbeditor-bracesMatching-sidebar" foreColor="ff6b8eb2"/>
+    <fontcolor name="readonly-files" bgColor="ff323232"/>
+    <fontcolor name="selection" bgColor="ff214283"/>
+    <fontcolor name="status-bar"/>
+    <fontcolor name="status-bar-bold" foreColor="red"/>
+    <fontcolor name="synchronized-text-blocks-ext" foreColor="ffcc0099"/>
+    <fontcolor name="synchronized-text-blocks-ext-slave" foreColor="ff996600"/>
+    <fontcolor name="text-limit-line-color" foreColor="ff555555"/>
+    <fontcolor name="trailing-whitespace"/>
+    <fontcolor name="west-sidebars-color"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-tokenColorings.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-tokenColorings.xml
new file mode 100644
index 0000000..c12bff5
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-tokenColorings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
+<fontscolors>
+    <fontcolor name="char" foreColor="ff6a8759"/>
+    <fontcolor name="comment" foreColor="gray"/>
+    <fontcolor name="default" foreColor="ffa9b7c6" bgColor="ff2b2b2b"/>
+    <fontcolor name="entity-reference" default="default"/>
+    <fontcolor name="error" waveUnderlined="ff9e2927"/>
+    <fontcolor name="field" default="identifier" foreColor="ff9876aa"/>
+    <fontcolor name="identifier" foreColor="ffa9b7c6"/>
+    <fontcolor name="keyword" foreColor="ffcc7832"/>
+    <fontcolor name="mark-occurrences" bgColor="ff364135"/>
+    <fontcolor name="markup-attribute" default="field" foreColor="ffbababa"/>
+    <fontcolor name="markup-attribute-value" default="string" foreColor="ffa5c261"/>
+    <fontcolor name="markup-element" default="keyword" foreColor="ffe8bf6a"/>
+    <fontcolor name="method" default="identifier"/>
+    <fontcolor name="number" foreColor="ff6897bb"/>
+    <fontcolor name="operator" foreColor="ffa9b7c6"/>
+    <fontcolor name="separator" foreColor="ffa9b7c6"/>
+    <fontcolor name="string" foreColor="ff6a8759"/>
+    <fontcolor name="url" foreColor="ff287bde" underline="ff287bde"/>
+    <fontcolor name="warning" bgColor="ff52503a" waveUnderlined="ff52503a"/>
+    <fontcolor name="whitespace" foreColor="ff505050"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml
index 7bf12aa..df066af 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml
@@ -22,28 +22,86 @@
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 <filesystem>
     <folder name="Editors">
+        <!--  Base token colorings and annotation/highlight colors -->
         <folder name="FontsColors">
             <folder name="FlatLafDark">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
                 <folder name="Defaults">
-                    <file name="org-netbeans-modules-defaults-token-colorings.xml" url="fontscolors/FlatLafDark-fontsColorsDefaults.xml">
-                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
+                    <file name="org-netbeans-modules-editor-annotations-colorings.xml" url="fontscolors/FlatLafDark-annotations.xml">
+                        <attr name="nbeditor-settings-ColoringType" stringvalue="annotation"/>
                     </file>
-                    <file name="org-netbeans-modules-defaults-highlight-colorings.xml" url="fontcolors/FlatLafDark-editor.xml">
-                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
+                    <file name="org-netbeans-modules-defaults-highlight-colorings.xml" url="fontscolors/FlatLafDark-highlights.xml"> 
                         <attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
                     </file>
+                    <file name="org-netbeans-modules-defaults-token-colorings.xml" url="fontscolors/FlatLafDark-tokenColorings.xml">
+                        <attr name="nbeditor-settings-ColoringType" stringvalue="token"/>
+                    </file>
                 </folder>
             </folder>
         </folder>
-        <folder name="text">
-            <folder name="x-properties">
+        <!--  Language specific token colorings -->
+        <folder name="application">
+            <folder name="xml-dtd">
                 <folder name="FontsColors">
                     <folder name="FlatLafDark">
                         <folder name="Defaults">
-                            <file name="org-netbeans-modules-properties-syntax-token-colorings.xml" url="fontscolors/FlatLaf-Properties-fontsColors.xml">
-                                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
-                            </file>
+                            <file name="org-netbeans-modules-defaults-xml-dtd-colorings.xml" url="fontscolors/FlatLafDark-DTD-tokenColorings.xml"/>
+                        </folder>
+                    </folder>
+                </folder>
+            </folder>
+        </folder>
+        <folder name="text">
+            <folder name="css">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-editor-java-token-colorings.xml" url="fontscolors/FlatLafDark-CSS-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="html">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-editor-html-colorings.xml" url="fontscolors/FlatLafDark-HTML-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="javascript">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-web-core-syntax-token-colorings.xml" url="fontscolors/FlatLafDark-JavaScript-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-apache-conf">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-editor-apache-conf-token-colorings.xml" url="fontscolors/FlatLafDark-ApacheConf-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-diff">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-editor-diff-token-colorings.xml" url="fontscolors/FlatLafDark-Diff-tokenColorings.xml"/>
+                        </folder>
+                    </folder>
+                </folder>
+            </folder>
+            <folder name="x-el">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-el-lexer-token-colorings.xml" url="fontscolors/FlatLafDark-EL-tokenColorings.xml"/>
                         </folder>
                     </folder>
                 </folder>
@@ -52,9 +110,115 @@
                 <folder name="FontsColors">
                     <folder name="FlatLafDark">
                         <folder name="Defaults">
-                            <file name="org-netbeans-modules-editor-java-token-colorings.xml" url="fontscolors/FlatLafDark-Java-fontsColors.xml">
-                                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
-                            </file>
+                            <file name="org-netbeans-modules-editor-java-token-colorings.xml" url="fontscolors/FlatLafDark-Java-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-json">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-editor-json-token-colorings.xml" url="fontscolors/FlatLafDark-JSON-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-jsp">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-web-core-syntax-token-colorings.xml" url="fontscolors/FlatLafDark-JSP-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-php5">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-web-core-syntax-token-colorings.xml" url="fontscolors/FlatLafDark-PHP-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-properties">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-properties-syntax-token-colorings.xml" url="fontscolors/FlatLafDark-Properties-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-sql">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-db-sql-editor-token-colorings.xml" url="fontscolors/FlatLafDark-SQL-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="x-tag">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-web-core-syntax-token-colorings.xml" url="fontscolors/FlatLafDark-Tag-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>      
+            <folder name="x-tpl">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-tpl-editor-token-colorings.xml" url="fontscolors/FlatLafDark-TPL-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="xhtml">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-editor-xhtml-colorings.xml" url="fontscolors/FlatLafDark-XHTML-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="xml">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-xml-text-token-colorings.xml" url="fontscolors/FlatLafDark-XML-tokenColorings.xml"/>
+                        </folder>
+                    </folder>                
+                </folder>
+            </folder>
+            <folder name="xml-external-parsed-entity">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-xml-external-parsed-entity-token-colorings.xml" url="fontscolors/FlatLafDark-XMLexternalentity-tokenColorings.xml"/>
+                        </folder>
+                    </folder>
+                </folder>
+            </folder>
+            <folder name="x-yaml">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-yaml-token-colorings.xml" url="fontscolors/FlatLafDark-YAML-tokenColorings.xml"/>
+                        </folder>
+                    </folder>
+                </folder>
+            </folder>
+            <folder name="x-markdown">
+                <folder name="FontsColors">
+                    <folder name="FlatLafDark">
+                        <folder name="Defaults">
+                            <file name="org-netbeans-modules-markdown-token-colorings.xml" url="fontscolors/FlatLafDark-Markdown-tokenColorings.xml"/>
                         </folder>
                     </folder>
                 </folder>