diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
index 743a82e9..b07ff3b6 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
@@ -32,6 +32,8 @@
 @menuHoverBackground=lighten(@menuBackground,10%,derived)
 @menuCheckBackground=lighten(@menuBackground,10%,derived)
 @menuCheckHoverBackground=lighten(@menuBackground,20%,derived)
+@menuAcceleratorForeground=darken(@foreground,15%)
+@menuAcceleratorSelectionForeground=@selectionForeground
 @cellFocusColor=#000
 @icon=#adadad
 
@@ -42,22 +44,6 @@
 @dropLineShortColor=lighten(List.selectionBackground,30%,lazy)
 
 
-#---- globals ----
-
-*.background=@background
-*.foreground=@foreground
-*.caretForeground=@foreground
-*.inactiveBackground=@background
-*.inactiveForeground=@disabledText
-*.selectionBackground=@selectionBackground
-*.selectionForeground=@selectionForeground
-*.disabledBackground=@background
-*.disabledForeground=@disabledText
-*.disabledText=@disabledText
-*.acceleratorForeground=darken(@foreground,15%)
-*.acceleratorSelectionForeground=@selectionForeground
-
-
 #---- system colors ----
 
 activeCaption=#434E60
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
index c3907dd4..5987d927 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -67,6 +67,22 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI
 @menuItemMargin=3,6,3,6
 
 
+#---- globals ----
+
+*.background=@background
+*.foreground=@foreground
+*.caretForeground=@foreground
+*.inactiveBackground=@background
+*.inactiveForeground=@disabledText
+*.selectionBackground=@selectionBackground
+*.selectionForeground=@selectionForeground
+*.disabledBackground=@background
+*.disabledForeground=@disabledText
+*.disabledText=@disabledText
+*.acceleratorForeground=@menuAcceleratorForeground
+*.acceleratorSelectionForeground=@menuAcceleratorSelectionForeground
+
+
 #---- system colors ----
 
 desktop=@textComponentBackground
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
index a5ff2639..af28a165 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
@@ -32,6 +32,8 @@
 @menuHoverBackground=darken(@menuBackground,10%,derived)
 @menuCheckBackground=darken(@menuBackground,10%,derived)
 @menuCheckHoverBackground=darken(@menuBackground,20%,derived)
+@menuAcceleratorForeground=lighten(@foreground,30%)
+@menuAcceleratorSelectionForeground=@selectionForeground
 @cellFocusColor=#000
 @icon=#afafaf
 
@@ -42,22 +44,6 @@
 @dropLineShortColor=darken(List.selectionBackground,20%,lazy)
 
 
-#---- globals ----
-
-*.background=@background
-*.foreground=@foreground
-*.caretForeground=@foreground
-*.inactiveBackground=@background
-*.inactiveForeground=@disabledText
-*.selectionBackground=@selectionBackground
-*.selectionForeground=@selectionForeground
-*.disabledBackground=@background
-*.disabledForeground=@disabledText
-*.disabledText=@disabledText
-*.acceleratorForeground=lighten(@foreground,30%)
-*.acceleratorSelectionForeground=@selectionForeground
-
-
 #---- system colors ----
 
 activeCaption=#99b4d1
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
index d49109a9..00428934 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
@@ -28,6 +28,8 @@
 @menuHoverBackground=darken(@menuBackground,10%)
 @menuCheckBackground=darken(@menuBackground,10%)
 @menuCheckHoverBackground=darken(@menuBackground,20%)
+@menuAcceleratorForeground=#f88
+@menuAcceleratorSelectionForeground=#fff
 @cellFocusColor=#f00
 @icon=#afafaf
 
@@ -39,20 +41,10 @@
 
 #---- globals ----
 
-*.background=@background
-*.foreground=@foreground
-*.textBackground=#cfc
-*.textForeground=#f00
 *.caretForeground=#00f
 *.inactiveBackground=#f0f0f0
 *.inactiveForeground=#008
-*.selectionBackground=@selectionBackground
-*.selectionForeground=@selectionForeground
 *.disabledBackground=#e0e0e0
-*.disabledForeground=@disabledText
-*.disabledText=@disabledText
-*.acceleratorForeground=#f88
-*.acceleratorSelectionForeground=#fff
 
 
 #---- system colors ----