diff --git a/Sources/RichTextKit/Context/RichTextContext+Colors.swift b/Sources/RichTextKit/Context/RichTextContext+Colors.swift
index f37ba4712..f3c5c30fe 100644
--- a/Sources/RichTextKit/Context/RichTextContext+Colors.swift
+++ b/Sources/RichTextKit/Context/RichTextContext+Colors.swift
@@ -37,11 +37,11 @@ public extension RichTextContext {
     ) {
         guard self.color(for: val) != color else { return }
         switch val {
-        case .foreground: userActionPublisher.send(.foregroundColor(color))
-        case .background: userActionPublisher.send(.backgroundColor(color))
-        case .strikethrough: userActionPublisher.send(.strikethroughColor(color))
-        case .stroke: userActionPublisher.send(.strokeColor(color))
-        case .underline: userActionPublisher.send(.underlineColor(color))
+        case .foreground: userActionPublisher.send(.foregroundColor(color)); foregroundColor = color
+        case .background: userActionPublisher.send(.backgroundColor(color)); backgroundColor = color
+        case .strikethrough: userActionPublisher.send(.strikethroughColor(color)); strikethroughColor = color
+        case .stroke: userActionPublisher.send(.strokeColor(color)); strokeColor = color
+        case .underline: userActionPublisher.send(.underlineColor(color)); underlineColor = color
         case .undefined: return
         }
     }
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift
index a5568d2fd..16aaa9a49 100644
--- a/Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift
+++ b/Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  RichTextCoordinator+ColorSubscriptions.swift
 //  
 //
 //  Created by Dominik Bucher on 18.01.2024.