diff --git a/RustPlayground/RustPlayground/Assets/Assets.xcassets/PlayIcon.imageset/Contents.json b/RustPlayground/RustPlayground/Assets/Assets.xcassets/PlayIcon.imageset/Contents.json
index c827003..ee67b76 100644
--- a/RustPlayground/RustPlayground/Assets/Assets.xcassets/PlayIcon.imageset/Contents.json
+++ b/RustPlayground/RustPlayground/Assets/Assets.xcassets/PlayIcon.imageset/Contents.json
@@ -19,5 +19,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/RustPlayground/RustPlayground/EditView.swift b/RustPlayground/RustPlayground/EditView.swift
index c3fbfa5..a41b74a 100644
--- a/RustPlayground/RustPlayground/EditView.swift
+++ b/RustPlayground/RustPlayground/EditView.swift
@@ -52,8 +52,6 @@ class EditView: NSView {
 
     override func draw(_ dirtyRect: NSRect) {
         guard let lines = lineSource, lines.totalLines > 0 else { return }
-        NSColor.white.setFill()
-        dirtyRect.fill()
 
         let font = EditorPreferences.shared.editorFont
         let linespace = font.linespace
@@ -65,7 +63,7 @@ class EditView: NSView {
 
         for lineNumber in first..<last {
             let line = lines.getLine(line: UInt32(lineNumber)) ?? RawLine.placeholder()
-            let attrString = NSMutableAttributedString(string: line.text, attributes: [.font: font, .foregroundColor: NSColor.black])
+            let attrString = NSMutableAttributedString(string: line.text, attributes: [.font: font, .foregroundColor: NSColor.textColor])
 
             for styleSpan in line.styles {
                 let range = NSRange(location: styleSpan.start, length: styleSpan.len)
@@ -93,7 +91,7 @@ class EditView: NSView {
                     let path = NSBezierPath()
                     path.move(to: NSPoint(x: X_OFFSET + cursorPos, y: selY))
                     path.line(to: NSPoint(x: X_OFFSET + cursorPos, y: selY + linespace))
-                    NSColor.black.setStroke()
+                    NSColor.textColor.setStroke()
                     path.stroke()
                 }
 
@@ -229,7 +227,8 @@ extension NSMutableAttributedString {
 
         var attrs = [NSAttributedString.Key : Any]()
         if style.foreground.alphaComponent != 0 {
-            attrs[.foregroundColor] = style.foreground
+            let color = style.foreground.isTextColor ? NSColor.textColor : style.foreground
+            attrs[.foregroundColor] = color
         }
 
         //FIXME: background color is always set, plus is paints over cursors.
@@ -252,3 +251,10 @@ extension NSMutableAttributedString {
         self.addAttributes(attrs, range: utf16Range)
     }
 }
+
+extension NSColor {
+    var isTextColor: Bool {
+        let themeTextGray: CGFloat = 0.19607843137254902
+        return self.blueComponent == themeTextGray && self.greenComponent == themeTextGray && self.redComponent == themeTextGray
+    }
+}
diff --git a/RustPlayground/RustPlayground/EditViewController.swift b/RustPlayground/RustPlayground/EditViewController.swift
index 52668fa..119b309 100644
--- a/RustPlayground/RustPlayground/EditViewController.swift
+++ b/RustPlayground/RustPlayground/EditViewController.swift
@@ -76,6 +76,8 @@ class EditViewController: NSViewController {
         } else {
             mode = nil
         }
+        scrollView.drawsBackground = true
+        scrollView.backgroundColor = NSColor.textBackgroundColor
     }
 
     override func viewWillAppear() {
diff --git a/RustPlayground/RustPlayground/OutputViewController.swift b/RustPlayground/RustPlayground/OutputViewController.swift
index 5f65945..1b456a9 100644
--- a/RustPlayground/RustPlayground/OutputViewController.swift
+++ b/RustPlayground/RustPlayground/OutputViewController.swift
@@ -40,7 +40,7 @@ class OutputViewController: NSViewController {
             self.outputTextView.font = self.outputFont
         }
 
-        let attributes = attributes ?? [.foregroundColor: NSColor.black]
+        let attributes = attributes ?? [.foregroundColor: NSColor.textColor]
         let insertedRange = NSRange(location: EOFRange.location, length: string.count)
         self.outputTextView.textStorage?.addAttributes(attributes, range: insertedRange)
     }