diff --git a/ILSpy/TreeNodes/AssemblyTreeNode.cs b/ILSpy/TreeNodes/AssemblyTreeNode.cs
index d2dfe9bf4..22923a5f6 100644
--- a/ILSpy/TreeNodes/AssemblyTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyTreeNode.cs
@@ -547,7 +547,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				if (!loadedAssm.HasLoadError)
 				{
 					loadedAssm.IsAutoLoaded = false;
-					node.RaisePropertyChanged(nameof(node.Foreground));
+					node.RaisePropertyChanged(nameof(ILSpyTreeNode.IsAutoLoaded));
 				}
 			}
 			MainWindow.Instance.CurrentAssemblyList.RefreshSave();
diff --git a/ILSpy/TreeNodes/ILSpyTreeNode.cs b/ILSpy/TreeNodes/ILSpyTreeNode.cs
index 40f5afb57..6796e48a3 100644
--- a/ILSpy/TreeNodes/ILSpyTreeNode.cs
+++ b/ILSpy/TreeNodes/ILSpyTreeNode.cs
@@ -185,22 +185,5 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		public virtual bool IsAutoLoaded {
 			get { return false; }
 		}
-
-		public override System.Windows.Media.Brush Foreground {
-			get {
-				if (IsPublicAPI)
-					if (IsAutoLoaded)
-					{
-						// HACK: should not be hard coded?
-						return System.Windows.Media.Brushes.SteelBlue;
-					}
-					else
-					{
-						return base.Foreground;
-					}
-				else
-					return System.Windows.SystemColors.GrayTextBrush;
-			}
-		}
 	}
 }
\ No newline at end of file
diff --git a/SharpTreeView/SharpTreeNode.cs b/SharpTreeView/SharpTreeNode.cs
index 97cd399cd..bf694c765 100644
--- a/SharpTreeView/SharpTreeNode.cs
+++ b/SharpTreeView/SharpTreeNode.cs
@@ -122,10 +122,6 @@ namespace ICSharpCode.TreeView
 			get { return null; }
 		}
 
-		public virtual Brush Foreground {
-			get { return SystemColors.WindowTextBrush; }
-		}
-
 		public virtual object Icon {
 			get { return null; }
 		}
diff --git a/SharpTreeView/Themes/Generic.xaml b/SharpTreeView/Themes/Generic.xaml
index 26c23a517..3ae30a781 100644
--- a/SharpTreeView/Themes/Generic.xaml
+++ b/SharpTreeView/Themes/Generic.xaml
@@ -179,13 +179,20 @@
                     <Border Background="Transparent">
                         <Border Background="{TemplateBinding Background}">
                             <Default:SharpTreeNodeView x:Name="nodeView"
-                                                       Foreground="{TemplateBinding Foreground}"
                                                        HorizontalAlignment="Left" />
                         </Border>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected"
-                                 Value="True">
+						<DataTrigger Binding="{Binding IsAutoLoaded}" 
+						             Value="True">
+							<Setter Property="Foreground" Value="SteelBlue" />
+						</DataTrigger>
+	                    <DataTrigger Binding="{Binding IsPublicAPI}" 
+	                                 Value="False">
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+						</DataTrigger>
+	                    <Trigger Property="IsSelected"
+	                             Value="True">
                             <Setter TargetName="nodeView"
                                     Property="TextBackground"
                                     Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />