diff --git a/Source/UI/ConsoleViewer.cpp b/Source/UI/ConsoleViewer.cpp
index 7cd2c6ec5..23229613e 100644
--- a/Source/UI/ConsoleViewer.cpp
+++ b/Source/UI/ConsoleViewer.cpp
@@ -76,8 +76,8 @@ ConsoleViewer::~ConsoleViewer()
 
 void ConsoleViewer::paint (Graphics& g)
 {
-    g.fillAll (findColour (ThemeColours::componentBackground));
-    g.setColour (findColour (ThemeColours::defaultText));
+    g.fillAll (findColour (ThemeColours::windowBackground));
+    g.setColour (findColour (ThemeColours::controlPanelText));
     g.setFont (FontOptions ("Inter", "Semi Bold", 20.0f));
     g.drawText ("Console", 20, 0, getWidth() - 40, 40, Justification::centredLeft);
 }
@@ -90,7 +90,7 @@ void ConsoleViewer::resized()
 }
 
 LogComponent::LogComponent (bool captureStdErrImmediately, bool captureStdOutImmediately)
-    : stdOutColour (findColour (ThemeColours::defaultText)), stdErrColour (Colours::red.darker (0.25f))
+    : stdOutColour (findColour (ThemeColours::controlPanelText)), stdErrColour (Colours::red.darker (0.25f))
 {
     consoleEditor.reset (new ConsoleEditor (codeDocument));
     consoleEditor->setFont (FontOptions (14.0f));
diff --git a/Source/UI/LookAndFeel/CustomLookAndFeel.cpp b/Source/UI/LookAndFeel/CustomLookAndFeel.cpp
index d5481c4a7..39dddff54 100644
--- a/Source/UI/LookAndFeel/CustomLookAndFeel.cpp
+++ b/Source/UI/LookAndFeel/CustomLookAndFeel.cpp
@@ -176,11 +176,12 @@ void CustomLookAndFeel::setTheme (ColourTheme theme)
     setColour (TextEditor::focusedOutlineColourId, currentThemeColours[ThemeColours::outline]);
     setColour (TextEditor::shadowColourId, transparent);
 
-    setColour (CodeEditorComponent::backgroundColourId, currentThemeColours[ThemeColours::widgetBackground]);
-    setColour (CodeEditorComponent::defaultTextColourId, currentThemeColours[ThemeColours::defaultText]);
-    setColour (CodeEditorComponent::highlightColourId, currentThemeColours[ThemeColours::widgetBackground].contrasting (0.5f).withAlpha (0.4f));
-    setColour (CodeEditorComponent::lineNumberBackgroundId, currentThemeColours[ThemeColours::widgetBackground]);
-    setColour (CodeEditorComponent::lineNumberTextId, currentThemeColours[ThemeColours::defaultText]);
+    float darkerAmount = theme == LIGHT ? 0.0f : 0.6f;
+    setColour (CodeEditorComponent::backgroundColourId, currentThemeColours[ThemeColours::controlPanelBackground].darker (darkerAmount));
+    setColour (CodeEditorComponent::defaultTextColourId, currentThemeColours[ThemeColours::controlPanelText]);
+    setColour (CodeEditorComponent::highlightColourId, currentThemeColours[ThemeColours::controlPanelBackground].contrasting (0.5f).withAlpha (0.4f));
+    setColour (CodeEditorComponent::lineNumberBackgroundId, currentThemeColours[ThemeColours::controlPanelBackground]);
+    setColour (CodeEditorComponent::lineNumberTextId, currentThemeColours[ThemeColours::controlPanelText]);
 
     setColour (CaretComponent::caretColourId, currentThemeColours[ThemeColours::defaultText]);