diff --git a/Lib/D7/UnitSwitcherD7.bpl b/Lib/D7/UnitSwitcherD7.bpl
index 44766d7..4dc4a76 100644
Binary files a/Lib/D7/UnitSwitcherD7.bpl and b/Lib/D7/UnitSwitcherD7.bpl differ
diff --git a/Packages/D7/UnitSwitcher.dof b/Packages/D7/UnitSwitcher.dof
index 9f6894d..e9bd9d2 100644
--- a/Packages/D7/UnitSwitcher.dof
+++ b/Packages/D7/UnitSwitcher.dof
@@ -137,10 +137,12 @@ Comments=
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[HistoryLists\hlSearchPath]
+Count=1
+Item0=P:\Algemeen\Components\Indy10\Core;P:\Algemeen\Components\Indy10\Protocols;P:\Algemeen\Components\Indy10\System
 [HistoryLists\hlUnitOutputDirectory]
 Count=1
-Item0=..\..\Lib\D7
+Item0=P:\algemeen\components\libd7
 [HistoryLists\hlBPLOutput]
-Count=2
-Item0=..\..\Lib\D7
-Item1=..\Lib\D7
+Count=1
+Item0=P:\algemeen\components\libd7
diff --git a/Source/BaseSwDialog.pas b/Source/BaseSwDialog.pas
index 5cdcf18..7493684 100644
--- a/Source/BaseSwDialog.pas
+++ b/Source/BaseSwDialog.pas
@@ -117,7 +117,7 @@ type
     procedure LoadSettings(); virtual;
     procedure SaveSettings(); virtual;
 
-    procedure DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect); virtual;
+    procedure DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect; AState: TOwnerDrawState); virtual;
   protected
     property ActiveItem:  TBaseSwItem     read FActiveItem  write FActiveItem;
     property ItemList:    TBaseSwItemList read FItemList    write FItemList;
@@ -548,7 +548,7 @@ begin
 end;
 
 
-procedure TfrmBaseSwDialog.DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect);
+procedure TfrmBaseSwDialog.DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect; AState: TOwnerDrawState);
 var
   text:         String;
 
@@ -599,7 +599,7 @@ begin
     end;
 
     Inc(textRect.Left, ilsTypes.Width + 4);
-    DrawItemText(Canvas, currentItem, textRect);
+    DrawItemText(Canvas, currentItem, textRect, State);
   end;
 end;
 
diff --git a/Source/CmpSwDialog.pas b/Source/CmpSwDialog.pas
index aa7efe2..b815ab0 100644
--- a/Source/CmpSwDialog.pas
+++ b/Source/CmpSwDialog.pas
@@ -75,7 +75,7 @@ type
     procedure LoadSettings(); override;
     procedure SaveSettings(); override;
 
-    procedure DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect); override;
+    procedure DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect; AState: TOwnerDrawState); override;
     procedure UpdateClassFilter();
     procedure SortList();
 
@@ -281,7 +281,7 @@ begin
 end;
 
 
-procedure TfrmCmpSwDialog.DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect);
+procedure TfrmCmpSwDialog.DrawItemText(ACanvas: TCanvas; AItem: TBaseSwItem; ARect: TRect; AState: TOwnerDrawState);
 var
   text:       String;
   textRect:   TRect;
@@ -299,7 +299,9 @@ begin
   textRect.Right  := ARect.Right - 2;
 
   { Draw component class text }
-  ACanvas.Font.Color  := clGrayText;
+  if not (odSelected in AState) then
+    ACanvas.Font.Color  := clGrayText;
+    
   text  := (AItem as TCmpSwComponent).ComponentClass;
 
   DrawText(ACanvas.Handle, PChar(text), Length(text), textRect, DT_SINGLELINE or