diff --git a/objects/ui2/outliner/generalModel.self b/objects/ui2/outliner/generalModel.self
index df5848c3..cefa02ff 100644
--- a/objects/ui2/outliner/generalModel.self
+++ b/objects/ui2/outliner/generalModel.self
@@ -1,6 +1,6 @@
  '$Revision: 30.19 $'
  '
-Copyright 1992-2014 AUTHORS.
+Copyright 1992-2016 AUTHORS.
 See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
 ["preFileIn" self] value
@@ -1604,6 +1604,13 @@ May cause me to expand if doExpand is true. -- dmu 10/04\x7fModuleInfo: Module:
             preferredBorderColor).
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> () From: ( | {
+         'Category: appearance\x7fModuleInfo: Module: generalModel InitialContents: FollowSlot'
+        
+         preferredEditorColor = ( |
+            | preferences outliner theme generalModelEditor).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> () From: ( | {
          'Category: appearance\x7fModuleInfo: Module: generalModel InitialContents: InitializeToExpression: (fontSpec copyName: \'verdana\' Size: 12 Style: \'bold\')\x7fVisibility: public'
         
diff --git a/objects/ui2/outliner/outlinerPreferences.self b/objects/ui2/outliner/outlinerPreferences.self
index 5cb51a63..49f5ed47 100644
--- a/objects/ui2/outliner/outlinerPreferences.self
+++ b/objects/ui2/outliner/outlinerPreferences.self
@@ -772,6 +772,13 @@ good for introducing language semantics, say.
             | borderColor).
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'preferences' -> 'outliner' -> 'themes' -> 'base' -> () From: ( | {
+         'Category: colors\x7fModuleInfo: Module: outlinerPreferences InitialContents: FollowSlot'
+        
+         generalModelEditor = ( |
+            | bodyColor).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'preferences' -> 'outliner' -> 'themes' -> 'base' -> () From: ( | {
          'Category: colors\x7fCategory: menus\x7fModuleInfo: Module: outlinerPreferences InitialContents: FollowSlot'
         
@@ -1288,6 +1295,13 @@ good for introducing language semantics, say.
             | dark).
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'preferences' -> 'outliner' -> 'themes' -> 'night' -> () From: ( | {
+         'ModuleInfo: Module: outlinerPreferences InitialContents: FollowSlot'
+        
+         generalModelEditor = ( |
+            | dull).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'preferences' -> 'outliner' -> 'themes' -> 'night' -> () From: ( | {
          'Category: menus\x7fModuleInfo: Module: outlinerPreferences InitialContents: FollowSlot'
         
diff --git a/objects/ui2/outliner/pluggableCommentStyle.self b/objects/ui2/outliner/pluggableCommentStyle.self
index 3a83d7ea..b8765114 100644
--- a/objects/ui2/outliner/pluggableCommentStyle.self
+++ b/objects/ui2/outliner/pluggableCommentStyle.self
@@ -1,8 +1,9 @@
  '$Revision: 30.6 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2016 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
+["preFileIn" self] value
 
 
  '-- Module body'
@@ -85,6 +86,14 @@ SlotsToOmit: parent.
             | ) .
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> 'commentStyleProto' -> 'parent' -> () From: ( | {
+         'ModuleInfo: Module: pluggableCommentStyle InitialContents: FollowSlot'
+        
+         color = ( |
+            | 
+            myModel preferredEditorColor).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> 'commentStyleProto' -> 'parent' -> () From: ( | {
          'ModuleInfo: Module: pluggableCommentStyle InitialContents: FollowSlot'
         
diff --git a/objects/ui2/outliner/pluggableContentsStyle.self b/objects/ui2/outliner/pluggableContentsStyle.self
index a62a28bd..200dda46 100644
--- a/objects/ui2/outliner/pluggableContentsStyle.self
+++ b/objects/ui2/outliner/pluggableContentsStyle.self
@@ -1,8 +1,9 @@
  '$Revision: 30.6 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2016 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
+["preFileIn" self] value
 
 
  '-- Module body'
@@ -16,6 +17,13 @@ See the LICENSE file for license information.
             | ) .
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> 'contentsEditorStyleProto' -> 'parent' -> () From: ( | {
+         'ModuleInfo: Module: pluggableContentsStyle InitialContents: FollowSlot'
+        
+         color = ( |
+            | myModel preferredEditorColor).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> 'contentsEditorStyleProto' -> 'parent' -> () From: ( | {
          'ModuleInfo: Module: pluggableContentsStyle InitialContents: FollowSlot\x7fVisibility: private'
         
diff --git a/objects/ui2/outliner/pluggableEditStyle.self b/objects/ui2/outliner/pluggableEditStyle.self
index ce7431bc..50384f3c 100644
--- a/objects/ui2/outliner/pluggableEditStyle.self
+++ b/objects/ui2/outliner/pluggableEditStyle.self
@@ -1,8 +1,9 @@
  '$Revision: 30.6 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2016 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
+["preFileIn" self] value
 
 
  '-- Module body'
@@ -32,6 +33,13 @@ SlotsToOmit: parent.
             | ) .
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> 'editWholeThingStyleProto' -> 'parent' -> () From: ( | {
+         'ModuleInfo: Module: pluggableEditStyle InitialContents: FollowSlot'
+        
+         color = ( |
+            | myModel preferredEditorColor).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'generalModel' -> 'parent' -> 'editWholeThingStyleProto' -> 'parent' -> () From: ( | {
          'ModuleInfo: Module: pluggableEditStyle InitialContents: FollowSlot\x7fVisibility: public'