diff --git a/app/MindWork AI Studio/Chat/ContentBlockComponent.razor b/app/MindWork AI Studio/Chat/ContentBlockComponent.razor
index 51aca3a..aeafa48 100644
--- a/app/MindWork AI Studio/Chat/ContentBlockComponent.razor	
+++ b/app/MindWork AI Studio/Chat/ContentBlockComponent.razor	
@@ -44,7 +44,7 @@
                             }
                             else
                             {
-                                <MudMarkdown Value="@textContent.Text" OverrideHeaderTypo="@Markdown.OverrideHeaderTypo"/>
+                                <MudMarkdown Value="@textContent.Text" OverrideHeaderTypo="@Markdown.OverrideHeaderTypo" CodeBlockTheme="@this.CodeColorPalette"/>
                             }
                         }
                     }
diff --git a/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs b/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs
index 2bef5f9..ab3caab 100644
--- a/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs	
+++ b/app/MindWork AI Studio/Chat/ContentBlockComponent.razor.cs	
@@ -1,3 +1,5 @@
+using AIStudio.Settings;
+
 using Microsoft.AspNetCore.Components;
 
 using RustService = AIStudio.Tools.RustService;
@@ -44,6 +46,9 @@ public partial class ContentBlockComponent : ComponentBase
     
     [Inject]
     private ISnackbar Snackbar { get; init; } = null!;
+    
+    [Inject]
+    private SettingsManager SettingsManager { get; init; } = null!;
 
     private bool HideContent { get; set; }
 
@@ -115,4 +120,6 @@ public partial class ContentBlockComponent : ComponentBase
     }
     
     private string CardClasses => $"my-2 rounded-lg {this.Class}";
+
+    private CodeBlockTheme CodeColorPalette => this.SettingsManager.IsDarkMode ? CodeBlockTheme.Dark : CodeBlockTheme.Default;
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md
index 51971d8..8273559 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.23.md	
@@ -1,5 +1,6 @@
 # v0.9.23, build 198 (2024-12-xx xx:xx UTC)
 - Added an ERI server coding assistant as a preview feature behind the RAG feature flag. This helps you implement an ERI server to gain access to, e.g., your enterprise data from within AI Studio.
+- Improved dark mode: Code blocks are now displayed in a dark theme as well (previously, they were displayed in a light theme, no matter what).
 - Improved profile handling: Every chat remembers the last profile used.
 - Improved the chat UI: You can now set the aspect ratio between workspaces and chat as you like.
 - Improved provider requests by handling rate limits by retrying requests.