diff --git a/Projects/SAMufasaGUI/colourhistory.lfm b/Projects/SAMufasaGUI/colourhistory.lfm
index 9db6478..ffd87eb 100644
--- a/Projects/SAMufasaGUI/colourhistory.lfm
+++ b/Projects/SAMufasaGUI/colourhistory.lfm
@@ -3,10 +3,11 @@ object ColourHistoryForm: TColourHistoryForm
   Height = 250
   Top = 299
   Width = 489
-  ActiveControl = SelectionName
+  ActiveControl = ColourValue
   Caption = 'Colour Picker History'
   ClientHeight = 250
   ClientWidth = 489
+  OnHide = UnSetCHShowMenu
   OnShow = SetCHShowMenu
   LCLVersion = '0.9.29'
   object ColourList: TListView
diff --git a/Projects/SAMufasaGUI/colourhistory.lrs b/Projects/SAMufasaGUI/colourhistory.lrs
index 3114c17..ce17770 100644
--- a/Projects/SAMufasaGUI/colourhistory.lrs
+++ b/Projects/SAMufasaGUI/colourhistory.lrs
@@ -2,19 +2,20 @@
 
 LazarusResources.Add('TColourHistoryForm','FORMDATA',[
   'TPF0'#18'TColourHistoryForm'#17'ColourHistoryForm'#4'Left'#3#238#1#6'Height'
-  +#3#250#0#3'Top'#3'+'#1#5'Width'#3#233#1#13'ActiveControl'#7#13'SelectionName'
-  +#7'Caption'#6#21'Colour Picker History'#12'ClientHeight'#3#250#0#11'ClientWi'
-  +'dth'#3#233#1#6'OnShow'#7#13'SetCHShowMenu'#10'LCLVersion'#6#6'0.9.29'#0#9'T'
-  +'ListView'#10'ColourList'#4'Left'#2#16#6'Height'#3#208#0#3'Top'#2#16#5'Width'
-  +#3'@'#1#7'Columns'#14#0#8'TabOrder'#2#0#12'OnSelectItem'#7#14'ChangeViewData'
-  +#0#0#7'TButton'#12'DeleteButton'#4'Left'#3'`'#1#6'Height'#2#25#3'Top'#3#199#0
-  +#5'Width'#3#128#0#7'Caption'#6#6'Delete'#7'OnClick'#7#14'DeleteSelected'#8'T'
-  +'abOrder'#2#1#0#0#5'TEdit'#13'SelectionName'#4'Left'#3'h'#1#6'Height'#2#27#3
-  +'Top'#2'h'#5'Width'#2'p'#8'OnChange'#7#10'ChangeName'#8'TabOrder'#2#2#4'Text'
-  +#6#4'Name'#0#0#7'TButton'#19'PickNewColourButton'#4'Left'#3'`'#1#6'Height'#2
-  +#25#3'Top'#3#160#0#5'Width'#3#128#0#7'Caption'#6#15'Pick New Colour'#8'TabOr'
-  +'der'#2#3#0#0#5'TEdit'#11'ColourValue'#4'Left'#3'h'#1#6'Height'#2#27#3'Top'#2
-  +#16#5'Width'#2'p'#8'ReadOnly'#9#8'TabOrder'#2#4#4'Text'#6#11'ColourValue'#0#0
-  +#6'TLabel'#10'CoordValue'#4'Left'#3'h'#1#6'Height'#2#18#3'Top'#2'@'#5'Width'
-  +#2'J'#7'Caption'#6#10'CoordValue'#11'ParentColor'#8#0#0#0
+  +#3#250#0#3'Top'#3'+'#1#5'Width'#3#233#1#13'ActiveControl'#7#11'ColourValue'#7
+  +'Caption'#6#21'Colour Picker History'#12'ClientHeight'#3#250#0#11'ClientWidt'
+  +'h'#3#233#1#6'OnHide'#7#15'UnSetCHShowMenu'#6'OnShow'#7#13'SetCHShowMenu'#10
+  +'LCLVersion'#6#6'0.9.29'#0#9'TListView'#10'ColourList'#4'Left'#2#16#6'Height'
+  +#3#208#0#3'Top'#2#16#5'Width'#3'@'#1#7'Columns'#14#0#8'TabOrder'#2#0#12'OnSe'
+  +'lectItem'#7#14'ChangeViewData'#0#0#7'TButton'#12'DeleteButton'#4'Left'#3'`'
+  +#1#6'Height'#2#25#3'Top'#3#199#0#5'Width'#3#128#0#7'Caption'#6#6'Delete'#7'O'
+  +'nClick'#7#14'DeleteSelected'#8'TabOrder'#2#1#0#0#5'TEdit'#13'SelectionName'
+  +#4'Left'#3'h'#1#6'Height'#2#27#3'Top'#2'h'#5'Width'#2'p'#8'OnChange'#7#10'Ch'
+  +'angeName'#8'TabOrder'#2#2#4'Text'#6#4'Name'#0#0#7'TButton'#19'PickNewColour'
+  +'Button'#4'Left'#3'`'#1#6'Height'#2#25#3'Top'#3#160#0#5'Width'#3#128#0#7'Cap'
+  +'tion'#6#15'Pick New Colour'#8'TabOrder'#2#3#0#0#5'TEdit'#11'ColourValue'#4
+  +'Left'#3'h'#1#6'Height'#2#27#3'Top'#2#16#5'Width'#2'p'#8'ReadOnly'#9#8'TabOr'
+  +'der'#2#4#4'Text'#6#11'ColourValue'#0#0#6'TLabel'#10'CoordValue'#4'Left'#3'h'
+  +#1#6'Height'#2#18#3'Top'#2'@'#5'Width'#2'J'#7'Caption'#6#10'CoordValue'#11'P'
+  +'arentColor'#8#0#0#0
 ]);
diff --git a/Projects/SAMufasaGUI/colourhistory.pas b/Projects/SAMufasaGUI/colourhistory.pas
index cc4ed34..a1eb5e7 100644
--- a/Projects/SAMufasaGUI/colourhistory.pas
+++ b/Projects/SAMufasaGUI/colourhistory.pas
@@ -37,6 +37,7 @@ type
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
     procedure SetCHShowMenu(Sender: TObject);
+    procedure UnSetCHShowMenu(Sender: TObject);
   private
     { private declarations }
   public
@@ -131,6 +132,11 @@ begin
   Form1.View_CH_Menu.Checked := True;
 end;
 
+procedure TColourHistoryForm.UnSetCHShowMenu(Sender: TObject);
+begin
+  Form1.View_CH_Menu.Checked := False;
+end;
+
 initialization
   {$I colourhistory.lrs}
 
diff --git a/Projects/SAMufasaGUI/project1.lpi b/Projects/SAMufasaGUI/project1.lpi
index d8f4ecb..bd8df68 100644
--- a/Projects/SAMufasaGUI/project1.lpi
+++ b/Projects/SAMufasaGUI/project1.lpi
@@ -1511,8 +1511,8 @@
         <ComponentName Value="ColourHistoryForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="colourhistory"/>
-        <CursorPos X="6" Y="88"/>
-        <TopLine Value="86"/>
+        <CursorPos X="2" Y="137"/>
+        <TopLine Value="116"/>
         <EditorIndex Value="4"/>
         <UsageCount Value="28"/>
         <Loaded Value="True"/>
@@ -1559,123 +1559,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="testunit.pas"/>
-        <Caret Line="825" Column="27" TopLine="808"/>
+        <Caret Line="822" Column="28" TopLine="810"/>
       </Position1>
       <Position2>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="822" Column="28" TopLine="810"/>
+        <Filename Value="colourhistory.pas"/>
+        <Caret Line="85" Column="32" TopLine="69"/>
       </Position2>
       <Position3>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="85" Column="32" TopLine="69"/>
+        <Caret Line="92" Column="32" TopLine="69"/>
       </Position3>
       <Position4>
-        <Filename Value="colourhistory.pas"/>
-        <Caret Line="92" Column="32" TopLine="69"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="501" Column="35" TopLine="484"/>
       </Position4>
       <Position5>
         <Filename Value="testunit.pas"/>
-        <Caret Line="501" Column="35" TopLine="484"/>
+        <Caret Line="859" Column="51" TopLine="840"/>
       </Position5>
       <Position6>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="859" Column="51" TopLine="840"/>
+        <Filename Value="colourhistory.pas"/>
+        <Caret Line="77" Column="1" TopLine="69"/>
       </Position6>
       <Position7>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="77" Column="1" TopLine="69"/>
+        <Caret Line="25" Column="44" TopLine="11"/>
       </Position7>
       <Position8>
-        <Filename Value="colourhistory.pas"/>
-        <Caret Line="25" Column="44" TopLine="11"/>
-      </Position8>
-      <Position9>
         <Filename Value="framescript.pas"/>
         <Caret Line="27" Column="46" TopLine="19"/>
-      </Position9>
-      <Position10>
+      </Position8>
+      <Position9>
         <Filename Value="colourhistory.pas"/>
         <Caret Line="51" Column="12" TopLine="28"/>
+      </Position9>
+      <Position10>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="30" Column="49" TopLine="26"/>
       </Position10>
       <Position11>
         <Filename Value="testunit.pas"/>
-        <Caret Line="30" Column="49" TopLine="26"/>
+        <Caret Line="38" Column="24" TopLine="26"/>
       </Position11>
       <Position12>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="38" Column="24" TopLine="26"/>
-      </Position12>
-      <Position13>
         <Filename Value="framescript.pas"/>
         <Caret Line="69" Column="29" TopLine="46"/>
+      </Position12>
+      <Position13>
+        <Filename Value="colourhistory.pas"/>
+        <Caret Line="113" Column="3" TopLine="96"/>
       </Position13>
       <Position14>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="113" Column="3" TopLine="96"/>
+        <Caret Line="36" Column="49" TopLine="23"/>
       </Position14>
       <Position15>
-        <Filename Value="colourhistory.pas"/>
-        <Caret Line="36" Column="49" TopLine="23"/>
-      </Position15>
-      <Position16>
         <Filename Value="testunit.pas"/>
         <Caret Line="14" Column="63" TopLine="1"/>
-      </Position16>
-      <Position17>
+      </Position15>
+      <Position16>
         <Filename Value="colourhistory.pas"/>
         <Caret Line="115" Column="43" TopLine="100"/>
-      </Position17>
-      <Position18>
+      </Position16>
+      <Position17>
         <Filename Value="testunit.pas"/>
         <Caret Line="324" Column="37" TopLine="318"/>
-      </Position18>
-      <Position19>
+      </Position17>
+      <Position18>
         <Filename Value="colourhistory.pas"/>
         <Caret Line="99" Column="49" TopLine="82"/>
+      </Position18>
+      <Position19>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="979" Column="62" TopLine="960"/>
       </Position19>
       <Position20>
         <Filename Value="testunit.pas"/>
-        <Caret Line="979" Column="62" TopLine="960"/>
+        <Caret Line="821" Column="31" TopLine="810"/>
       </Position20>
       <Position21>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="821" Column="31" TopLine="810"/>
-      </Position21>
-      <Position22>
         <Filename Value="colourhistory.pas"/>
         <Caret Line="90" Column="43" TopLine="83"/>
-      </Position22>
-      <Position23>
+      </Position21>
+      <Position22>
         <Filename Value="testunit.pas"/>
         <Caret Line="823" Column="51" TopLine="807"/>
+      </Position22>
+      <Position23>
+        <Filename Value="colourhistory.pas"/>
+        <Caret Line="131" Column="37" TopLine="107"/>
       </Position23>
       <Position24>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="131" Column="37" TopLine="107"/>
+        <Caret Line="119" Column="76" TopLine="107"/>
       </Position24>
       <Position25>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="119" Column="76" TopLine="107"/>
+        <Caret Line="98" Column="14" TopLine="84"/>
       </Position25>
       <Position26>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="98" Column="14" TopLine="84"/>
+        <Caret Line="97" Column="14" TopLine="84"/>
       </Position26>
       <Position27>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="97" Column="14" TopLine="84"/>
+        <Caret Line="94" Column="47" TopLine="84"/>
       </Position27>
       <Position28>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="94" Column="47" TopLine="84"/>
+        <Caret Line="97" Column="58" TopLine="86"/>
       </Position28>
       <Position29>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="97" Column="58" TopLine="86"/>
+        <Caret Line="96" Column="58" TopLine="86"/>
       </Position29>
       <Position30>
         <Filename Value="colourhistory.pas"/>
-        <Caret Line="96" Column="58" TopLine="86"/>
+        <Caret Line="102" Column="38" TopLine="86"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/Projects/SAMufasaGUI/testunit.lrs b/Projects/SAMufasaGUI/testunit.lrs
index 5f4ff97..4118cb5 100644
--- a/Projects/SAMufasaGUI/testunit.lrs
+++ b/Projects/SAMufasaGUI/testunit.lrs
@@ -1,3 +1,5 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#18#1#6'Height'#3'-'#2#3'Top'#3#233#0#5'Wi'
   +'dth'#3#219#2#13'ActiveControl'#7#11'ScriptPanel'#7'Caption'#6#17'THA FUKING'