diff --git a/core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java b/core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
index 552bc50c..3df1bac6 100644
--- a/core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
@@ -49,10 +49,10 @@ public class ForegroundColorGenerationTask extends ColorAdjustmentTask {
     protected void runTask(final Theme currentTheme, final Properties properties) {
         Properties props = currentTheme.loadPropertyFile("accents", true);
         AccentColorRule accentColorRule = currentTheme.getAccentColorRule();
-        if (accentColorRule.getAccentColor() != null) {
+        if (accentColorRule.getAccentColor() != null && currentTheme.supportsCustomAccentColor()) {
             adjust(ACCENT_LIST_KEY, props, list -> adjustForegroundList(list, properties));
         }
-        if (accentColorRule.getSelectionColor() != null) {
+        if (accentColorRule.getSelectionColor() != null && currentTheme.supportsCustomSelectionColor()) {
             adjust(FOREGROUND_LIST_KEY, props, list -> adjustForegroundList(list, properties));
         }
     }
diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties
index 8bf01a38..6ac537e4 100644
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties
@@ -42,4 +42,4 @@ accent.propertyList              = {widgetFillDefault:[100,100,100];\
                                     hyperlink:[100,100,100]}
 selection.propertyList           = {textCompSelectionBackground}
 
-selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground}
+selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}
diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties
index 2f934304..7ca788d3 100644
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties
@@ -45,4 +45,4 @@ accent.propertyList              = {widgetFillDefault:[100,100,100];\
                                     hyperlink:[100,100,100]}
 selection.propertyList           = {textCompSelectionBackground}
 
-selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground}
+selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}
diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties
index 9d75c721..29ff3ef8 100644
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties
@@ -26,4 +26,4 @@
 #
 selection.propertyList           = {textCompSelectionBackground}
 
-selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground}
+selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}
diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties
index 9d75c721..29ff3ef8 100644
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties
@@ -26,4 +26,4 @@
 #
 selection.propertyList           = {textCompSelectionBackground}
 
-selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground}
+selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}