--- a/Tools__CodeView2.st	Wed Sep 15 16:10:12 2021 +0100
+++ b/Tools__CodeView2.st	Wed Sep 15 21:39:40 2021 +0100
@@ -35,7 +35,7 @@
 		showGutterChannel showAcceptCancelBarChannel modeHolder services
 		servicesFromClient syntaxElements currentParseNodeHolder
 		currentBlockNodeHolder syntaxElementSelection highlightEmphasis
-		diffMode synchronizedCodeViews'
+		diffMode synchronizedCodeViews theme'
 	classVariableNames:'TraceSelectors'
 	poolDictionaries:''
 	category:'Interface-CodeView'
@@ -758,6 +758,18 @@
     "Modified: / 23-06-2010 / 17:01:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+theme
+    ^ theme
+
+    "Created: / 15-09-2021 / 21:15:01 / Jan Vrany <jan.vrany@labware.com>"
+!
+
+theme: aCodeViewTheme
+    theme := aCodeViewTheme
+
+    "Created: / 15-09-2021 / 21:15:15 / Jan Vrany <jan.vrany@labware.com>"
+!
+
 unsynchronizeWith: aCodeView
 
     self assert: aCodeView ~= self.
@@ -1712,12 +1724,14 @@
 
     servicesFromClient := false.
     services := OrderedCollection new.
+    theme := UserPreferences current codeViewTheme.
     self initializeServices.
 
     "Modified: / 14-12-2009 / 13:59:53 / Jindra <a>"
     "Modified: / 06-04-2010 / 13:56:35 / Jakub <zelenja7@fel.cvut.cz>"
     "Modified: / 06-10-2011 / 14:15:48 / cg"
     "Modified: / 16-02-2012 / 23:05:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-09-2021 / 21:15:57 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 initializeGutterView