diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml
index 8fbdd7d58..fe65a4531 100644
--- a/ILSpy/MainWindow.xaml
+++ b/ILSpy/MainWindow.xaml
@@ -31,7 +31,39 @@
 				ShowRoot="False"
 				AllowDropOrder="True"
 				AllowDrop="True"
-				BorderThickness="0" Visibility="Visible" />
+				BorderThickness="0" Visibility="Visible">
+			<tv:SharpTreeView.ItemContainerStyle>
+				<Style TargetType="tv:SharpTreeViewItem">
+
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="{x:Type tv:SharpTreeViewItem}">
+								<Border Background="Transparent">
+									<Border Background="{TemplateBinding Background}">
+										<tv:SharpTreeNodeView x:Name="nodeView" HorizontalAlignment="Left" />
+									</Border>
+								</Border>
+								<ControlTemplate.Triggers>
+									<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}}" />
+										<Setter TargetName="nodeView" Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+									</Trigger>
+									<Trigger Property="IsEnabled" Value="False">
+										<Setter TargetName="nodeView" Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+									</Trigger>
+								</ControlTemplate.Triggers>
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</tv:SharpTreeView.ItemContainerStyle>
+		</tv:SharpTreeView>
 
 		<DataTemplate x:Key="AssemblyListPaneTemplate">
 			<ContentControl Content="{StaticResource AssemblyTreeView}" />
diff --git a/SharpTreeView/Themes/Generic.xaml b/SharpTreeView/Themes/Generic.xaml
index 3ae30a781..5d3109b35 100644
--- a/SharpTreeView/Themes/Generic.xaml
+++ b/SharpTreeView/Themes/Generic.xaml
@@ -183,14 +183,6 @@
                         </Border>
                     </Border>
                     <ControlTemplate.Triggers>
-						<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"