diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
index c2b7817272a9..a437b4f1bc9f 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
@@ -1181,7 +1181,7 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic
 
   private static JLabel groupInfoLabel(String text) {
     JLabel label = new JLabel(text);
-    label.setForeground(UIUtil.getLabelDisabledForeground());
+    label.setForeground(JBUI.CurrentTheme.BigPopup.listTitleLabelForeground());
     label.setFont(UIUtil.getLabelFont().deriveFont(UIUtil.getFontSize(UIUtil.FontSize.SMALL)));
     label.setOpaque(false);
     return label;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
index 8587513991e6..c616e4700794 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
@@ -165,9 +165,9 @@ public abstract class PsiElementListCellRenderer<T extends PsiElement> extends J
     }
 
     private void appendLocationText(boolean selected, Color bgColor, boolean isProblemFile, String containerText) {
-      SimpleTextAttributes locationAttrs = new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, JBColor.GRAY);
+      SimpleTextAttributes locationAttrs = SimpleTextAttributes.GRAYED_ATTRIBUTES;
       if (isProblemFile) {
-        SimpleTextAttributes wavedAttributes = SimpleTextAttributes.merge(new SimpleTextAttributes(SimpleTextAttributes.STYLE_WAVED, JBColor.GRAY, JBColor.RED), locationAttrs);
+        SimpleTextAttributes wavedAttributes = SimpleTextAttributes.merge(new SimpleTextAttributes(SimpleTextAttributes.STYLE_WAVED, UIUtil.getInactiveTextColor(), JBColor.RED), locationAttrs);
         java.util.regex.Matcher matcher = CONTAINER_PATTERN.matcher(containerText);
         if (matcher.matches()) {
           String prefix = matcher.group(1);
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
index b819318a6e4b..506cb2df92e8 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
@@ -711,7 +711,7 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
         return panel;
       }
 
-      Color groupFg = isSelected ? UIUtil.getListSelectionForeground() : UIUtil.getLabelDisabledForeground();
+      Color groupFg = isSelected ? UIUtil.getListSelectionForeground() : UIUtil.getInactiveTextColor();
 
       Object value = ((MatchedValue) matchedValue).value;
       String pattern = ((MatchedValue)matchedValue).pattern;
@@ -759,8 +759,7 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
         appendWithColoredMatches(nameComponent, name, pattern, fg, isSelected);
         if (StringUtil.isNotEmpty(shortcutText)) {
           nameComponent.append(" " + shortcutText,
-                               new SimpleTextAttributes(SimpleTextAttributes.STYLE_SMALLER | SimpleTextAttributes.STYLE_BOLD,
-                                                        UIUtil.isUnderDarcula() ? groupFg : ColorUtil.shift(groupFg, 1.3)));
+                   new SimpleTextAttributes(SimpleTextAttributes.STYLE_SMALLER | SimpleTextAttributes.STYLE_BOLD, groupFg));
         }
       }
       else if (value instanceof OptionDescription) {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
index 0d8876d859c4..b34049249da3 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
@@ -270,7 +270,7 @@ SearchEverywhere.Tab.active.background=555a5e
 SearchEverywhere.Tab.active.foreground=bbbbbb
 SearchEverywhere.SearchField.background=3c3f41
 SearchEverywhere.SearchField.borderColor=646464
-SearchEverywhere.List.Separator.Color=505050
+SearchEverywhere.List.separatorColor=505050
 SearchEverywhere.SearchField.grayForeground=808080
 SearchEverywhere.Advertiser.foreground=808080
 SearchEverywhere.Advertiser.background=45494a
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
index ef881d8a44ed..6429bfffda80 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
@@ -251,7 +251,7 @@ SearchEverywhere.Tab.active.background=dedede
 SearchEverywhere.Tab.active.foreground=000000
 SearchEverywhere.SearchField.background=ffffff
 SearchEverywhere.SearchField.borderColor=bdbdbd
-SearchEverywhere.List.Separator.Color=dcdcdc
+SearchEverywhere.List.separatorColor=dcdcdc
 SearchEverywhere.SearchField.grayForeground=808080
 SearchEverywhere.Advertiser.foreground=808080
 SearchEverywhere.Advertiser.background=f2f2f2
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
index 4e7ef9d54c2f..9b36e40db86a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
@@ -261,7 +261,7 @@ SearchEverywhere.Tab.active.background=dedede
 SearchEverywhere.Tab.active.foreground=000000
 SearchEverywhere.SearchField.background=ffffff
 SearchEverywhere.SearchField.borderColor=bdbdbd
-SearchEverywhere.List.Separator.Color=dcdcdc
+SearchEverywhere.List.separatorColor=dcdcdc
 SearchEverywhere.SearchField.grayForeground=808080
 SearchEverywhere.Advertiser.foreground=808080
 SearchEverywhere.Advertiser.background=f2f2f2
diff --git a/platform/util/src/com/intellij/util/ui/JBUI.java b/platform/util/src/com/intellij/util/ui/JBUI.java
index 5f2fc5853983..b8d85970efcd 100644
--- a/platform/util/src/com/intellij/util/ui/JBUI.java
+++ b/platform/util/src/com/intellij/util/ui/JBUI.java
@@ -1803,7 +1803,11 @@ public class JBUI {
       }
 
       public static Color listSeparatorColor() {
-        return JBColor.namedColor("SearchEverywhere.List.Separator.Color", 0xdcdcdc);
+        return JBColor.namedColor("SearchEverywhere.List.separatorColor", Gray.xDC);
+      }
+
+      public static Color listTitleLabelForeground() {
+        return JBColor.namedColor("SearchEverywhere.List.Separator.foreground", UIUtil.getLabelDisabledForeground());
       }
 
       public static Color searchFieldGrayForeground()  {
diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index ed0d7de2e58d..2c7050004a15 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -1106,9 +1106,7 @@ public class UIUtil {
   }
 
   public static Color getLabelDisabledForeground() {
-    final Color color = UIManager.getColor("Label.disabledForeground");
-    if (color != null) return color;
-    return UIManager.getColor("Label.disabledText");
+    return JBColor.namedColor("Label.disabledForeground", JBColor.GRAY);
   }
 
   public static Color getContextHelpForeground() {
diff --git a/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java b/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java
index 04f3d394c277..0cab99048fa0 100644
--- a/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java
+++ b/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java
@@ -684,7 +684,7 @@ public final class UiDefaultsHardcodedKeys {
     "ScrollPane.foreground",
     "ScrollPaneUI",
     "SearchEverywhere.Header.background",
-    "SearchEverywhere.List.Separator.Color",
+    "SearchEverywhere.List.separatorColor",
     "SearchEverywhere.SearchField.borderColor",
     "SearchEverywhere.SearchField.background",
     "SearchEverywhere.Tab.active.background",
@@ -1313,7 +1313,8 @@ public final class UiDefaultsHardcodedKeys {
     "SearchEverywhere.Advertiser.background",
     "SearchEverywhere.Advertiser.foreground",
     "SearchEverywhere.Header.background",
-    "SearchEverywhere.List.Separator.Color",
+    "SearchEverywhere.List.separatorColor",
+    "SearchEverywhere.List.Separator.foreground",
     "SearchEverywhere.SearchField.background",
     "SearchEverywhere.SearchField.borderColor",
     "SearchEverywhere.SearchField.grayForeground",