diff --git a/components/mbColorLib/HSLColorPicker.pas b/components/mbColorLib/HSLColorPicker.pas
index 784f24ee1..42788379d 100644
--- a/components/mbColorLib/HSLColorPicker.pas
+++ b/components/mbColorLib/HSLColorPicker.pas
@@ -33,6 +33,8 @@ type
     FHSCursor, FLCursor: TCursor;
     PBack: TBitmap;
     function GetManual: boolean;
+    function GetShowHint: Boolean;
+    procedure SetShowHint(AValue: Boolean);
     procedure SetLumIncrement(i: integer);
     procedure SelectColor(c: TColor);
     procedure SetH(v: integer);
@@ -83,7 +85,7 @@ type
     property HSPickerCursor: TCursor read FHSCursor write SetHSCursor default crDefault;
     property LPickerCursor: TCursor read FLCursor write SetLCursor default crDefault;
     property TabStop default true;
-    property ShowHint;
+    property ShowHint read GetShowHint write SetShowHint;
     property ParentShowHint;
     property Anchors;
     property Align;
@@ -323,6 +325,19 @@ function THSLColorPicker.GetManual:boolean;
 begin
   Result := FHSPicker.Manual or FLPicker.Manual;
 end;
+
+function THSLColorPicker.GetShowHint: Boolean;
+begin
+  Result := inherited ShowHint;
+end;
+
+procedure THSLColorPicker.SetShowHint(AValue: Boolean);
+begin
+  inherited ShowHint := AValue;
+  FHSPicker.ShowHint := AValue;
+  FLPicker.ShowHint := AValue;
+end;
+
                                          (*
 procedure THSLColorPicker.PaintParentBack;
 begin
diff --git a/components/mbColorLib/OfficeMoreColorsDialog.lfm b/components/mbColorLib/OfficeMoreColorsDialog.lfm
index a990bc3fc..a4c455c75 100644
--- a/components/mbColorLib/OfficeMoreColorsDialog.lfm
+++ b/components/mbColorLib/OfficeMoreColorsDialog.lfm
@@ -1,7 +1,7 @@
 object OfficeMoreColorsWin: TOfficeMoreColorsWin
-  Left = 194
+  Left = 265
   Height = 300
-  Top = 112
+  Top = 115
   Width = 331
   ActiveControl = OKbtn
   BorderIcons = [biSystemMenu]
@@ -90,35 +90,35 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
       object Label3: TLabel
         Left = 6
         Height = 13
-        Top = 154
-        Width = 60
+        Top = 150
+        Width = 32
         Anchors = [akLeft, akBottom]
-        Caption = 'Color mo&del:'
+        Caption = 'Mo&del:'
         FocusControl = ColorModel
         ParentColor = False
       end
-      object LRedOrHue: TLabel
+      object LRed: TLabel
         Left = 6
         Height = 13
-        Top = 180
+        Top = 176
         Width = 23
         Anchors = [akLeft, akBottom]
         Caption = '&Red:'
         ParentColor = False
       end
-      object LGreenOrSat: TLabel
+      object LGreen: TLabel
         Left = 6
         Height = 13
-        Top = 206
+        Top = 202
         Width = 33
         Anchors = [akLeft, akBottom]
         Caption = '&Green:'
         ParentColor = False
       end
-      object LBlueOrLum: TLabel
+      object LBlue: TLabel
         Left = 6
         Height = 13
-        Top = 232
+        Top = 228
         Width = 24
         Anchors = [akLeft, akBottom]
         Caption = '&Blue:'
@@ -126,9 +126,9 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
       end
       object HSL: THSLColorPicker
         Left = 6
-        Height = 128
+        Height = 124
         Top = 20
-        Width = 203
+        Width = 210
         HSPickerHintFormat = 'H: %h S: %s'#13'Hex: %hex'
         LPickerHintFormat = 'Luminance: %l'
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -136,10 +136,10 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
         OnChange = HSLChange
       end
       object ColorModel: TComboBox
-        Left = 74
+        Left = 48
         Height = 21
-        Top = 148
-        Width = 92
+        Top = 146
+        Width = 147
         Anchors = [akLeft, akBottom]
         ItemHeight = 13
         ItemIndex = 0
@@ -152,6 +152,44 @@ object OfficeMoreColorsWin: TOfficeMoreColorsWin
         TabOrder = 1
         Text = 'RGB'
       end
+      object SLH: TSLHColorPicker
+        Left = 6
+        Height = 80
+        Top = 20
+        Width = 115
+        HPickerHintFormat = 'Hue: %h'
+        SLPickerHintFormat = 'S: %hslS L: %l'#13'Hex: %hex'
+        ParentShowHint = False
+        TabOrder = 2
+        OnChange = SLHChange
+      end
+      object LHue: TLabel
+        Left = 120
+        Height = 13
+        Top = 176
+        Width = 23
+        Anchors = [akLeft, akBottom]
+        Caption = '&Hue:'
+        ParentColor = False
+      end
+      object LSat: TLabel
+        Left = 120
+        Height = 13
+        Top = 202
+        Width = 20
+        Anchors = [akLeft, akBottom]
+        Caption = '&Sat:'
+        ParentColor = False
+      end
+      object LLum: TLabel
+        Left = 120
+        Height = 13
+        Top = 228
+        Width = 23
+        Anchors = [akLeft, akBottom]
+        Caption = 'L&um:'
+        ParentColor = False
+      end
     end
   end
   object OKbtn: TButton
diff --git a/components/mbColorLib/OfficeMoreColorsDialog.pas b/components/mbColorLib/OfficeMoreColorsDialog.pas
index 04d70108f..fc9100a07 100644
--- a/components/mbColorLib/OfficeMoreColorsDialog.pas
+++ b/components/mbColorLib/OfficeMoreColorsDialog.pas
@@ -14,11 +14,18 @@ uses
   Forms, StdCtrls, ExtCtrls, ComCtrls,
   HexaColorPicker, HSLColorPicker, RGBHSLUtils,
   mbColorPreview, {$IFDEF mbXP_Lib}mbXPSpinEdit, mbXPSizeGrip,{$ELSE} Spin,{$ENDIF}
-  HTMLColors;
+  HTMLColors, SLHColorPicker;
 
 type
+
+  { TOfficeMoreColorsWin }
+
   TOfficeMoreColorsWin = class(TForm)
+    LLum: TLabel;
+    LSat: TLabel;
+    LHue: TLabel;
     Pages: TPageControl;
+    SLH: TSLHColorPicker;
     Standard: TTabSheet;
     Custom: TTabSheet;
     Hexa: THexaColorPicker;
@@ -27,9 +34,9 @@ type
     Label2: TLabel;
     Label3: TLabel;
     ColorModel: TComboBox;
-    LRedOrHue: TLabel;
-    LGreenOrSat: TLabel;
-    LBlueOrLum: TLabel;
+    LRed: TLabel;
+    LGreen: TLabel;
+    LBlue: TLabel;
     Label4: TLabel;
     Label5: TLabel;
     OKbtn: TButton;
@@ -38,9 +45,12 @@ type
     OldSwatch: TmbColorPreview;
     procedure ColorModelChange(Sender: TObject);
     procedure HSLChange(Sender: TObject);
-    procedure ERedOrHueChange(Sender: TObject);
-    procedure EGreenOrSatChange(Sender: TObject);
-    procedure EBlueOrLumChange(Sender: TObject);
+    procedure ERedChange(Sender: TObject);
+    procedure EGreenChange(Sender: TObject);
+    procedure EBlueChange(Sender: TObject);
+    procedure EHueChange(Sender: TObject);
+    procedure ESatChange(Sender: TObject);
+    procedure ELumChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormResize(Sender: TObject);
@@ -50,12 +60,15 @@ type
     procedure OldSwatchColorChange(Sender: TObject);
     procedure PagesChange(Sender: TObject);
     procedure SetAllToSel(c: TColor);
+    procedure SLHChange(Sender: TObject);
   private
     {$IFDEF mbXP_Lib}
-    ERedOrHue, EGreenOrSat, EBlueOrLum: TmbXPSpinEdit;
+    ERed, EGreen, EBlue: TmbXPSpinEdit;
+    EHue, ESat, ELum: TmbXPSpinEdit;
     grip: TmbXPSizeGrip;
     {$ELSE}
-    ERedOrHue, EGreenOrSat, EBlueOrLum: TSpinEdit;
+    ERed, EGreen, EBlue: TSpinEdit;
+    EHue, ESat, ELum: TSpinEdit;
     {$ENDIF}
     FLockChange: Integer;
   protected
@@ -89,124 +102,102 @@ begin
 end; 
 
 procedure TOfficeMoreColorsWin.ColorModelChange(Sender: TObject);
-var
-  h, s, l: Integer;
 begin
- case ColorModel.ItemIndex of
-  0:
-   begin
-    LRedOrHue.Caption := '&Red:';
-    LGreenOrSat.Caption := '&Green:';
-    LBlueOrLum.Caption := '&Blue:';
-    ERedOrHue.MaxValue := 255;
-    EGreenOrSat.MaxValue := 255;
-    EBlueOrLum.MaxValue := 255;
-    ERedOrHue.Value := GetRValue(NewSwatch.Color);
-    EGreenOrSat.Value := GetGValue(NewSwatch.Color);
-    EBlueOrLum.Value := GetBValue(NewSwatch.Color);
-   end;
-  1:
-   begin
-    LRedOrHue.Caption := 'H&ue:';
-    LGreenOrSat.Caption := '&Sat:';
-    LBlueOrLum.Caption := '&Lum:';
-    ERedOrHue.MaxValue := MaxHue; //238;
-    EGreenOrSat.MaxValue := MaxSat; //240;
-    EBlueOrLum.MaxValue := MaxLum; //240;
-    RGBtoHSLRange(NewSwatch.Color, h, s, l);
-    ERedOrHue.Value := h;
-    EGreenOrSat.Value := s;
-    EBlueOrLum.Value := l;
-   end;
- end;
+  HSL.Visible := ColorModel.ItemIndex = 0;
+  SLH.Visible := ColorModel.ItemIndex = 1;
+  HSL.SelectedColor := NewSwatch.Color;
+  SLH.SelectedColor := NewSwatch.Color;
 end;
 
 procedure TOfficeMoreColorsWin.HSLChange(Sender: TObject);
 begin
- if HSL.Manual then
-  case ColorModel.ItemIndex of
-   0:
-    begin
-      ERedOrHue.Value := HSL.RValue;
-      EGreenOrSat.Value := HSL.GValue;
-      EBlueOrLum.Value := HSL.BValue;
-      NewSwatch.Color := HSL.SelectedColor;
-    end;
-   1:
-    begin
-      ERedOrHue.Value := HSL.HValue;
-      EGreenOrSat.Value := HSL.SValue;
-      EBlueOrLum.Value := HSL.LValue;
-      NewSwatch.Color := HSL.SelectedColor;
-    end;
+  NewSwatch.Color := HSL.SelectedColor;
+end;
+
+procedure TOfficeMoreColorsWin.ERedChange(Sender: TObject);
+begin
+  if (ERed.Text <> '') and
+     (ERed.Focused {$IFDEF DELPHI} or ERed.Button.Focused{$ENDIF}) then
+  begin
+    inc(FLockChange);
+    HSL.RValue := ERed.Value;
+    SLH.RValue := ERed.Value;
+    NewSwatch.Color := RGB(ERed.Value, EGreen.Value, EBlue.Value);
+    dec(FLockChange);
   end;
 end;
 
-procedure TOfficeMoreColorsWin.ERedOrHueChange(Sender: TObject);
+procedure TOfficeMoreColorsWin.EGreenChange(Sender: TObject);
 begin
-  inc(FLockChange);
-  if (ERedOrHue.Text <> '') and
-     (ERedOrHue.Focused {$IFDEF DELPHI} or ERedOrHue.Button.Focused{$ENDIF})
-  then
-    case ColorModel.ItemIndex of
-      0: begin
-           HSL.RValue := ERedOrHue.Value;
-           NewSwatch.Color := RGB(ERedOrHue.Value, EGreenOrSat.Value, EBlueOrLum.Value);
-         end;
-      1: begin
-           HSL.HValue := ERedOrHue.Value;
-           NewSwatch.Color := HSLRangeToRGB(ERedOrHue.Value, EGreenOrSat.Value, EBlueOrLum.Value);
-         end;
-    end;
-  dec(FLockChange);
+  if (EGreen.Text <> '') and
+     (EGreen.Focused {$IFDEF DELPHI}or EGreen.Button.Focused{$ENDIF}) then
+  begin
+    inc(FLockChange);
+    HSL.GValue := EGreen.Value;
+    SLH.GValue := EGreen.Value;
+    NewSwatch.Color := RGB(ERed.Value, EGreen.Value, EBlue.Value);
+    dec(FLockChange);
+  end;
 end;
 
-procedure TOfficeMoreColorsWin.EGreenOrSatChange(Sender: TObject);
+procedure TOfficeMoreColorsWin.EBlueChange(Sender: TObject);
 begin
-  inc(FLockChange);
-  NewSwatch.OnColorChange := nil;
-  if (EGreenOrSat.Text <> '') and
-     (EGreenOrSat.Focused {$IFDEF DELPHI}or EGreen.ButtonOrSat.Focused{$ENDIF})
-  then
-    case ColorModel.ItemIndex of
-      0: begin
-           HSL.GValue := EGreenOrSat.Value;
-           NewSwatch.Color := RGB(ERedOrHue.Value, EGreenOrSat.Value, EBlueOrLum.Value);
-         end;
-      1: begin
-           HSL.SValue := EGreenOrSat.Value;
-           NewSwatch.Color := HSLRangeToRGB(ERedOrHue.Value, EGreenOrSat.Value, EBlueOrLum.Value);
-         end;
-    end;
-  dec(FLockChange);
+  if (EBlue.Text <> '') and
+     (EBlue.Focused {$IFDEF DELPHI} or EBlue.Button.Focused{$ENDIF}) then
+  begin
+    inc(FLockChange);
+    HSL.BValue := EBlue.Value;
+    SLH.BValue := EBlue.Value;
+    NewSwatch.Color := RGB(ERed.Value, EGreen.Value, EBlue.Value);
+    dec(FLockChange);
+  end;
 end;
 
-procedure TOfficeMoreColorsWin.EBlueOrLumChange(Sender: TObject);
+procedure TOfficeMoreColorsWin.EHueChange(Sender: TObject);
 begin
-  inc(FLockChange);
-  if (EBlueOrLum.Text <> '') and
-     (EBlueOrLum.Focused {$IFDEF DELPHI} or EBlueOrLum.Button.Focused{$ENDIF})
-  then
-    case ColorModel.ItemIndex of
-      0: begin
-           HSL.BValue := EBlueOrLum.Value;
-           NewSwatch.Color := RGB(ERedOrHue.Value, EGreenOrSat.Value, EBlueOrLum.Value);
-         end;
-      1: begin
-           HSL.LValue := EBlueOrLum.Value;
-           NewSwatch.Color := HSLRangeToRGB(ERedOrHue.Value, EGreenOrSat.Value, EBlueOrLum.Value);
-         end;
-    end;
-  dec(FLockChange);
+  if (EHue.Text <> '') and
+     (EHue.Focused {$IFDEF DELPHI} or EHue.Button.Focused{$ENDIF}) then
+  begin
+    inc(FLockChange);
+    HSL.HValue := EHue.Value;
+    SLH.HValue := EHue.Value;
+    NewSwatch.Color := HSLRangeToRGB(EHue.Value, ESat.Value, ELum.Value);
+    dec(FLockChange);
+  end;
+end;
+
+procedure TOfficeMoreColorsWin.ESatChange(Sender: TObject);
+begin
+  if (ESat.Text <> '') and
+     (ESat.Focused {$IFDEF DELPHI}or ESat.Button.Focused{$ENDIF}) then
+  begin
+    inc(FLockChange);
+    HSL.SValue := ESat.Value;
+    SLH.SValue := ESat.Value;
+    NewSwatch.Color := HSLRangeToRGB(EHue.Value, ESat.Value, ELum.Value);
+    dec(FLockChange);
+  end;
+end;
+
+procedure TOfficeMoreColorsWin.ELumChange(Sender: TObject);
+begin
+  if (ELum.Text <> '') and
+     (ELum.Focused {$IFDEF DELPHI} or ELum.Button.Focused{$ENDIF}) then
+  begin
+    inc(FLockChange);
+    HSL.LValue := ELum.Value;
+    NewSwatch.Color := HSLRangeToRGB(EHue.Value, ESat.Value, ELum.Value);
+    dec(FLockChange);
+  end;
 end;
 
 procedure TOfficeMoreColorsWin.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
- case Key of
-  VK_RETURN: ModalResult := mrOK;
-  VK_ESCAPE: ModalResult := mrCancel;
- end;
+  case Key of
+   VK_RETURN: ModalResult := mrOK;
+   VK_ESCAPE: ModalResult := mrCancel;
+  end;
 end;
 
 procedure TOfficeMoreColorsWin.HexaChange(Sender: TObject);
@@ -227,59 +218,51 @@ var
   h,s,l: Integer;
 begin
   NewSwatch.Hint := GetHint(NewSwatch.Color);
-  if (ERedOrHue = nil) or (EBlueOrLum = nil) or (EGreenOrSat = nil) or
-     (FLockChange <> 0)
+  if (ERed = nil) or (EBlue = nil) or (EGreen = nil) or
+     (EHue = nil) or (ESat = nil) or (ELum = nil) or (FLockChange <> 0)
   then
     exit;
 
-  if ColorModel.ItemIndex = 0 then  // RGB
-  begin
-    ERedOrHue.Value := GetRValue(NewSwatch.Color);
-    EGreenOrSat.Value := GetGValue(NewSwatch.Color);
-    EBlueOrLum.Value := GetBValue(NewSwatch.Color);
-  end else
-  begin
-    ERedOrHue.Value := GetHValue(NewSwatch.Color);
-    EGreenOrSat.Value := GetSValue(NewSwatch.Color);
-    EBlueOrLum.Value := GetLValue(NewSwatch.Color);
-  end;
+  ERed.Value := GetRValue(NewSwatch.Color);
+  EGreen.Value := GetGValue(NewSwatch.Color);
+  EBlue.Value := GetBValue(NewSwatch.Color);
+  EHue.Value := GetHValue(NewSwatch.Color);
+  ESat.Value := GetSValue(NewSwatch.Color);
+  ELum.Value := GetLValue(NewSwatch.Color);
 end;
 
 procedure TOfficeMoreColorsWin.OldSwatchColorChange(Sender: TObject);
 begin
- OldSwatch.Hint := GetHint(OldSwatch.Color);
- SetAllToSel(OldSwatch.Color);
+  OldSwatch.Hint := GetHint(OldSwatch.Color);
+  SetAllToSel(OldSwatch.Color);
 end;
 
 procedure TOfficeMoreColorsWin.SetAllToSel(c: TColor);
 var
   h, s, l: Integer;
 begin
- case Pages.ActivePageIndex of
-  // Standard Page
-  0: Hexa.SelectedColor := c;
-  // Custom Page
-  1:
-   begin
-    HSL.SelectedColor := c;
-    case ColorModel.ItemIndex of
-     0:
-      begin
-       ERedOrHue.Value := GetRValue(c);
-       EGreenOrSat.Value := GetGValue(c);
-       EBlueOrLum.Value := GetBValue(c);
-      end;
-     1:
-      begin
-       RGBtoHSLRange(c, h, s, l);
-       ERedOrHue.Value := h;
-       EGreenOrSat.Value := s;
-       EBlueOrLum.Value := l;
-      end;
-    end;
-   end;
- end;
- NewSwatch.Color := c;
+  case Pages.ActivePageIndex of
+    // Standard Page
+    0: Hexa.SelectedColor := c;
+    // Custom Page
+    1: begin
+         HSL.SelectedColor := c;
+         SLH.SelectedColor := c;
+         ERed.Value := GetRValue(c);
+         EGreen.Value := GetGValue(c);
+         EBlue.Value := GetBValue(c);
+         RGBtoHSLRange(c, h, s, l);
+         EHue.Value := h;
+         ESat.Value := s;
+         ELum.Value := l;
+       end;
+  end;
+  NewSwatch.Color := c;
+end;
+
+procedure TOfficeMoreColorsWin.SLHChange(Sender: TObject);
+begin
+  NewSwatch.Color := SLH.SelectedColor;
 end;
 
 procedure TOfficeMoreColorsWin.PagesChange(Sender: TObject);
@@ -289,6 +272,8 @@ end;
 
 procedure TOfficeMoreColorsWin.FormResize(Sender: TObject);
 begin
+  SLH.Width := SLH.Parent.ClientWidth - SLH.Left;
+  SLH.Height := ColorModel.Top - SLH.Top;
 {$IFDEF mbXP_Lib}
   grip.Left := ClientWidth - 15;
   grip.Top := ClientHeight - 15;
@@ -297,58 +282,116 @@ end;
 
 procedure TOfficeMoreColorsWin.FormCreate(Sender: TObject);
 begin
+  SLH.Width := HSL.Width;
+  SLH.Height := HSL.Height;
+  SLH.Top := HSL.Top;
+  SLH.Left := HSL.Left;
+  SLH.Hide;
+//  SLH.Anchors := [akLeft, akTop, akRight, akBottom];
+
  {$IFDEF mbXP_Lib}
-  ERedOrHue := TmbXPSpinEdit.CreateParented(Custom.Handle);
-  EGreenOrSat := TmbXPSpinEdit.CreateParented(Custom.Handle);
-  EBlueOrLum := TmbXPSpinEdit.CreateParented(Custom.Handle);
+  ERed := TmbXPSpinEdit.CreateParented(Custom.Handle);
+  EGreen := TmbXPSpinEdit.CreateParented(Custom.Handle);
+  EBlue := TmbXPSpinEdit.CreateParented(Custom.Handle);
   grip := TmbXPSizeGrip.CreateParented(Self.Handle);
  {$ELSE}
-  ERedOrHue := TSpinEdit.CreateParented(Custom.Handle);
-  EGreenOrSat := TSpinEdit.CreateParented(Custom.Handle);
-  EBlueOrLum := TSpinEdit.CreateParented(Custom.Handle);
+  ERed := TSpinEdit.CreateParented(Custom.Handle);
+  EGreen := TSpinEdit.CreateParented(Custom.Handle);
+  EBlue := TSpinEdit.CreateParented(Custom.Handle);
+  EHue := TSpinEdit.CreateParented(Custom.Handle);
+  ESat := TSpinEdit.createParented(Custom.Handle);
+  ELum := TSpinEdit.CreateParented(Custom.Handle);
  {$ENDIF}
-  with ERedOrHue do
+  with ERed do
   begin
    Name := 'ERed';
    Width := 47;
    Height := 22;
-   Left := 74;
-   Top := LRedOrHue.Top - 4; //198;
+   Left := ColorModel.Left;
+   Top := LRed.Top - 4; //198;
+   Alignment := taRightJustify;
    Anchors := [akLeft, akBottom];
    MaxValue := 255;
    MinValue := 0;
    Value := 0;
-   OnChange := @ERedOrHueChange;
+   OnChange := @ERedChange;
   end;
-  with EGreenOrSat do
+  with EGreen do
   begin
    Name := 'EGreen';
    Width := 47;
    Height := 22;
-   Left := 74;
-   Top := LGreenOrSat.Top - 3; //224;
+   Left := ColorModel.Left;
+   Top := LGreen.Top - 3; //224;
+   Alignment := taRightJustify;
    Anchors := [akLeft, akBottom];
    MaxValue := 255;
    MinValue := 0;
    Value := 0;
-   OnChange := @EGreenOrSatChange;
+   OnChange := @EGreenChange;
   end;
-  with EBlueOrLum do
+  with EBlue do
   begin
    Name := 'EBlue';
    Width := 47;
    Height := 22;
-   Left := 74;
-   Top := LBlueOrLum.Top - 4; //251;
+   Left := ColorModel.Left;
+   Top := LBlue.Top - 4; //251;
+   Alignment := taRightJustify;
    Anchors := [akLeft, akBottom];
    MaxValue := 255;
    MinValue := 0;
    Value := 0;
-   OnChange := @EBlueOrLumChange;
+   OnChange := @EBlueChange;
   end;
-  Custom.InsertControl(ERedOrHue);
-  Custom.InsertControl(EGreenOrSat);
-  Custom.InsertControl(EBlueOrLum);
+  with EHue do
+  begin
+   Name := 'EHue';
+   Width := 47;
+   Height := 22;
+   Left := ColorModel.Left + ColorModel.Width - Width;
+   Top := ERed.Top;
+   Alignment := taRightJustify;
+   Anchors := [akLeft, akBottom];
+   MaxValue := MaxHue;
+   MinValue := 0;
+   Value := 0;
+   OnChange := @EHueChange;
+  end;
+  with ESat do
+  begin
+   Name := 'ESat';
+   Width := 47;
+   Height := 22;
+   Left := ColorModel.Left + ColorModel.Width - Width;
+   Top := EGreen.Top;
+   Alignment := taRightJustify;
+   Anchors := [akLeft, akBottom];
+   MaxValue := MaxSat;
+   MinValue := 0;
+   Value := 0;
+   OnChange := @ESatChange;
+  end;
+  with ELum do
+  begin
+   Name := 'ELum';
+   Width := 47;
+   Height := 22;
+   Left := ColorModel.Left + ColorModel.Width - Width;
+   Top := EBlue.Top;
+   Alignment := taRightJustify;
+   Anchors := [akLeft, akBottom];
+   MaxValue := MaxLum;
+   MinValue := 0;
+   Value := 0;
+   OnChange := @ELumChange;
+  end;
+  Custom.InsertControl(ERed);
+  Custom.InsertControl(EGreen);
+  Custom.InsertControl(EBlue);
+  Custom.InsertControl(EHue);
+  Custom.InsertControl(ESat);
+  Custom.InsertControl(ELum);
  {$IFDEF mbXP_Lib}
   with grip do
   begin
diff --git a/components/mbColorLib/SLHColorPicker.pas b/components/mbColorLib/SLHColorPicker.pas
index 0fd521300..2391daea9 100644
--- a/components/mbColorLib/SLHColorPicker.pas
+++ b/components/mbColorLib/SLHColorPicker.pas
@@ -32,6 +32,8 @@ type
     FSLCursor, FHCursor: TCursor;
     PBack: TBitmap;
     function GetManual: boolean;
+    function GetShowHint: Boolean;
+    procedure SetShowHint(AValue: Boolean);
     procedure SelectColor(c: TColor);
     procedure SetH(v: integer);
     procedure SetS(v: integer);
@@ -79,7 +81,7 @@ type
     property HPickerCursor: TCursor read FHCursor write SetHCursor default crDefault;
     property SLPickerCursor: TCursor read FSLCursor write SetSLCursor default crDefault;
     property TabStop default true;
-    property ShowHint;
+    property ShowHint read GetShowHint write SetShowHint;
     property ParentShowHint;
     property Anchors;
     property Align;
@@ -326,6 +328,18 @@ begin
   Result := FHPicker.Manual or FSLPicker.Manual;
 end;
 
+function TSLHColorPicker.GetShowHint: Boolean;
+begin
+  result := inherited ShowHint;
+end;
+
+procedure TSLHColorPicker.SetShowHint(AValue: Boolean);
+begin
+  inherited ShowHint := AValue;
+  FSLPicker.ShowHint := AValue;
+  FHPicker.ShowHint := AValue;
+end;
+
 procedure TSLHColorPicker.Resize;
 begin
   inherited;
diff --git a/components/mbColorLib/examples/fulldemo/main.lfm b/components/mbColorLib/examples/fulldemo/main.lfm
index 9008d495a..c8db6cb64 100644
--- a/components/mbColorLib/examples/fulldemo/main.lfm
+++ b/components/mbColorLib/examples/fulldemo/main.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 255
+  Left = 447
   Height = 344
-  Top = 107
+  Top = 197
   Width = 543
   Caption = 'mbColor Lib v2.0.1 Demo'
   ClientHeight = 344
@@ -42,9 +42,9 @@ object Form1: TForm1
     Height = 331
     Top = 6
     Width = 399
-    ActivePage = TabSheet8
+    ActivePage = TabSheet6
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 8
+    TabIndex = 5
     TabOrder = 0
     OnMouseMove = PageControl1MouseMove
     object TabSheet1: TTabSheet
diff --git a/components/mbColorLib/mbcolorliblaz.lpk b/components/mbColorLib/mbcolorliblaz.lpk
index e73362b0f..ea17abfb1 100644
--- a/components/mbColorLib/mbcolorliblaz.lpk
+++ b/components/mbColorLib/mbcolorliblaz.lpk
@@ -203,13 +203,16 @@
         <UnitName Value="mbReg"/>
       </Item46>
     </Files>
-    <RequiredPkgs Count="2">
+    <RequiredPkgs Count="3">
       <Item1>
-        <PackageName Value="LCLBase"/>
+        <PackageName Value="LCL"/>
       </Item1>
       <Item2>
-        <PackageName Value="FCL"/>
+        <PackageName Value="LCLBase"/>
       </Item2>
+      <Item3>
+        <PackageName Value="FCL"/>
+      </Item3>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>