diff --git a/Projects/SAMufasaGUI/colourhistory.pas b/Projects/SAMufasaGUI/colourhistory.pas
index 29214bf..b7d4826 100644
--- a/Projects/SAMufasaGUI/colourhistory.pas
+++ b/Projects/SAMufasaGUI/colourhistory.pas
@@ -103,6 +103,8 @@ begin
   bmp.Canvas.Rectangle(0,0,16,16);
 
   it.ImageIndex:= CHImages.Add(bmp,nil);
+  it.SelectedIndex:=it.ImageIndex;
+
   bmp.Free;
 end;
 
@@ -118,6 +120,7 @@ begin
       TColourPickerObject(ColourTree.Selected.Data).Free;
     i:=ColourTree.Selected.ImageIndex;
     ColourTree.Selected.ImageIndex:=0;
+    ColourTree.Selected.SelectedIndex:=-0;
     CHImages.Delete(i);
 
     ColourTree.Selected.Delete;
diff --git a/Projects/SAMufasaGUI/project1.lpi b/Projects/SAMufasaGUI/project1.lpi
index 93ab813..b39304a 100644
--- a/Projects/SAMufasaGUI/project1.lpi
+++ b/Projects/SAMufasaGUI/project1.lpi
@@ -1006,7 +1006,7 @@
         <UnitName Value="web"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="188"/>
+        <UsageCount Value="189"/>
       </Unit136>
       <Unit137>
         <Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@@ -1205,7 +1205,7 @@
         <UnitName Value="framescript"/>
         <CursorPos X="106" Y="190"/>
         <TopLine Value="180"/>
-        <UsageCount Value="181"/>
+        <UsageCount Value="182"/>
       </Unit161>
       <Unit162>
         <Filename Value="framesynedit.lrs"/>
@@ -1517,10 +1517,10 @@
         <ComponentName Value="ColourHistoryForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="colourhistory"/>
-        <CursorPos X="73" Y="197"/>
-        <TopLine Value="176"/>
+        <CursorPos X="24" Y="123"/>
+        <TopLine Value="103"/>
         <EditorIndex Value="6"/>
-        <UsageCount Value="118"/>
+        <UsageCount Value="119"/>
         <Loaded Value="True"/>
       </Unit208>
       <Unit209>
@@ -1771,7 +1771,7 @@
         <UnitName Value="about"/>
         <CursorPos X="44" Y="21"/>
         <TopLine Value="4"/>
-        <UsageCount Value="81"/>
+        <UsageCount Value="82"/>
       </Unit245>
       <Unit246>
         <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/file.inc"/>
@@ -1785,7 +1785,7 @@
         <UnitName Value="internets"/>
         <CursorPos X="87" Y="3"/>
         <TopLine Value="1"/>
-        <UsageCount Value="75"/>
+        <UsageCount Value="76"/>
       </Unit247>
       <Unit248>
         <Filename Value="debugimageform.pas"/>
@@ -1794,7 +1794,7 @@
         <UnitName Value="debugimageform"/>
         <CursorPos X="20" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="62"/>
+        <UsageCount Value="63"/>
       </Unit248>
       <Unit249>
         <Filename Value="debugimage.pas"/>
@@ -1805,7 +1805,7 @@
         <CursorPos X="87" Y="39"/>
         <TopLine Value="20"/>
         <EditorIndex Value="7"/>
-        <UsageCount Value="61"/>
+        <UsageCount Value="62"/>
         <Loaded Value="True"/>
       </Unit249>
       <Unit250>
@@ -1920,119 +1920,119 @@
       </Position1>
       <Position2>
         <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="27" Column="37" TopLine="1"/>
+        <Caret Line="66" Column="33" TopLine="45"/>
       </Position2>
       <Position3>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="65" Column="33" TopLine="45"/>
-      </Position3>
-      <Position4>
-        <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
-        <Caret Line="66" Column="33" TopLine="45"/>
-      </Position4>
-      <Position5>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
         <Caret Line="137" Column="47" TopLine="110"/>
-      </Position5>
-      <Position6>
+      </Position3>
+      <Position4>
         <Filename Value="../../Units/MMLCore/ocr.pas"/>
         <Caret Line="81" Column="71" TopLine="62"/>
-      </Position6>
-      <Position7>
+      </Position4>
+      <Position5>
         <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
         <Caret Line="65" Column="33" TopLine="41"/>
-      </Position7>
-      <Position8>
+      </Position5>
+      <Position6>
         <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
         <Caret Line="66" Column="33" TopLine="41"/>
-      </Position8>
-      <Position9>
+      </Position6>
+      <Position7>
         <Filename Value="../../Units/MMLCore/finder.pas"/>
         <Caret Line="101" Column="5" TopLine="97"/>
-      </Position9>
-      <Position10>
+      </Position7>
+      <Position8>
         <Filename Value="../../Units/MMLCore/finder.pas"/>
         <Caret Line="30" Column="28" TopLine="25"/>
-      </Position10>
-      <Position11>
+      </Position8>
+      <Position9>
         <Filename Value="testunit.pas"/>
         <Caret Line="401" Column="43" TopLine="380"/>
+      </Position9>
+      <Position10>
+        <Filename Value="colourhistory.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position10>
+      <Position11>
+        <Filename Value="colourhistory.pas"/>
+        <Caret Line="106" Column="29" TopLine="73"/>
       </Position11>
       <Position12>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="105" Column="5" TopLine="85"/>
       </Position12>
       <Position13>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="106" Column="29" TopLine="73"/>
+        <Caret Line="117" Column="13" TopLine="93"/>
       </Position13>
       <Position14>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="105" Column="5" TopLine="85"/>
+        <Caret Line="39" Column="66" TopLine="169"/>
       </Position14>
       <Position15>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="117" Column="13" TopLine="93"/>
+        <Caret Line="170" Column="19" TopLine="149"/>
       </Position15>
       <Position16>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="39" Column="66" TopLine="169"/>
+        <Caret Line="176" Column="33" TopLine="150"/>
       </Position16>
       <Position17>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="170" Column="19" TopLine="149"/>
+        <Caret Line="175" Column="27" TopLine="155"/>
       </Position17>
       <Position18>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="176" Column="33" TopLine="150"/>
+        <Caret Line="194" Column="1" TopLine="177"/>
       </Position18>
       <Position19>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="175" Column="27" TopLine="155"/>
+        <Caret Line="120" Column="77" TopLine="100"/>
       </Position19>
       <Position20>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="194" Column="1" TopLine="177"/>
+        <Caret Line="35" Column="29" TopLine="23"/>
       </Position20>
       <Position21>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="120" Column="77" TopLine="100"/>
+        <Caret Line="192" Column="8" TopLine="152"/>
       </Position21>
       <Position22>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="35" Column="29" TopLine="23"/>
+        <Caret Line="117" Column="3" TopLine="101"/>
       </Position22>
       <Position23>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="192" Column="8" TopLine="152"/>
+        <Caret Line="35" Column="50" TopLine="27"/>
       </Position23>
       <Position24>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="117" Column="3" TopLine="101"/>
+        <Caret Line="47" Column="36" TopLine="27"/>
       </Position24>
       <Position25>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="35" Column="50" TopLine="27"/>
+        <Caret Line="26" Column="13" TopLine="12"/>
       </Position25>
       <Position26>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="47" Column="36" TopLine="27"/>
+        <Caret Line="107" Column="19" TopLine="83"/>
       </Position26>
       <Position27>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="26" Column="13" TopLine="12"/>
+        <Caret Line="46" Column="10" TopLine="13"/>
       </Position27>
       <Position28>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="107" Column="19" TopLine="83"/>
+        <Caret Line="177" Column="1" TopLine="158"/>
       </Position28>
       <Position29>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="46" Column="10" TopLine="13"/>
+        <Caret Line="123" Column="26" TopLine="107"/>
       </Position29>
       <Position30>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="177" Column="1" TopLine="158"/>
+        <Caret Line="107" Column="1" TopLine="88"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>