diff --git a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
index 58db3a143..558e27480 100644
--- a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -4,7 +4,6 @@
     <Version Value="9"/>
     <General>
       <Flags>
-        <AlwaysBuild Value="False"/>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
       <MainUnit Value="0"/>
@@ -55,7 +54,7 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="63">
+    <Units Count="64">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -397,8 +396,8 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1216"/>
-        <CursorPos X="48" Y="1240"/>
+        <TopLine Value="2001"/>
+        <CursorPos X="1" Y="2015"/>
         <UsageCount Value="16"/>
         <Bookmarks Count="3">
           <Item0 X="3" Y="2250" ID="3"/>
@@ -523,10 +522,12 @@
       <Unit59>
         <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
         <UnitName Value="Grids"/>
+        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="3153"/>
-        <CursorPos X="27" Y="3167"/>
+        <TopLine Value="3866"/>
+        <CursorPos X="1" Y="3891"/>
         <UsageCount Value="13"/>
+        <Loaded Value="True"/>
       </Unit59>
       <Unit60>
         <Filename Value="../../../../../../wine/1/1/rx.diff"/>
@@ -552,32 +553,141 @@
         <CursorPos X="1" Y="569"/>
         <UsageCount Value="10"/>
       </Unit62>
+      <Unit63>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1116"/>
+        <CursorPos X="1" Y="1132"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit63>
     </Units>
-    <JumpHistory Count="5" HistoryIndex="4">
+    <JumpHistory Count="30" HistoryIndex="25">
       <Position1>
-        <Filename Value="rxdbgridmainunit.pas"/>
-        <Caret Line="161" Column="14" TopLine="148"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="2046" Column="1" TopLine="2031"/>
       </Position1>
       <Position2>
-        <Filename Value="rxdbgridmainunit.pas"/>
-        <Caret Line="8" Column="73" TopLine="1"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3141" Column="1" TopLine="3126"/>
       </Position2>
       <Position3>
-        <Filename Value="rxdbgridmainunit.pas"/>
-        <Caret Line="9" Column="12" TopLine="1"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3142" Column="1" TopLine="3126"/>
       </Position3>
       <Position4>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="43" Column="11" TopLine="37"/>
+        <Caret Line="3354" Column="1" TopLine="3339"/>
       </Position4>
       <Position5>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Caret Line="1231" Column="29" TopLine="1216"/>
+        <Caret Line="3359" Column="1" TopLine="3339"/>
       </Position5>
+      <Position6>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3378" Column="1" TopLine="3363"/>
+      </Position6>
+      <Position7>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3380" Column="1" TopLine="3363"/>
+      </Position7>
+      <Position8>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3381" Column="1" TopLine="3363"/>
+      </Position8>
+      <Position9>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3382" Column="1" TopLine="3363"/>
+      </Position9>
+      <Position10>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3388" Column="1" TopLine="3363"/>
+      </Position10>
+      <Position11>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3366" Column="1" TopLine="3360"/>
+      </Position11>
+      <Position12>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3866" Column="1" TopLine="3861"/>
+      </Position12>
+      <Position13>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3868" Column="1" TopLine="3861"/>
+      </Position13>
+      <Position14>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3869" Column="1" TopLine="3861"/>
+      </Position14>
+      <Position15>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3871" Column="1" TopLine="3861"/>
+      </Position15>
+      <Position16>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3873" Column="1" TopLine="3861"/>
+      </Position16>
+      <Position17>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3878" Column="1" TopLine="3861"/>
+      </Position17>
+      <Position18>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3880" Column="1" TopLine="3861"/>
+      </Position18>
+      <Position19>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3882" Column="1" TopLine="3861"/>
+      </Position19>
+      <Position20>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3884" Column="1" TopLine="3861"/>
+      </Position20>
+      <Position21>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3887" Column="1" TopLine="3862"/>
+      </Position21>
+      <Position22>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3888" Column="1" TopLine="3863"/>
+      </Position22>
+      <Position23>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Caret Line="1131" Column="1" TopLine="1116"/>
+      </Position23>
+      <Position24>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
+        <Caret Line="1132" Column="1" TopLine="1116"/>
+      </Position24>
+      <Position25>
+        <Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
+        <Caret Line="3891" Column="1" TopLine="3866"/>
+      </Position25>
+      <Position26>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="2046" Column="1" TopLine="2031"/>
+      </Position26>
+      <Position27>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3358" Column="1" TopLine="3343"/>
+      </Position27>
+      <Position28>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3359" Column="1" TopLine="3343"/>
+      </Position28>
+      <Position29>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3358" Column="1" TopLine="3343"/>
+      </Position29>
+      <Position30>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Caret Line="3359" Column="1" TopLine="3343"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <Target>
       <Filename Value="RxDBGridDemo"/>
     </Target>
@@ -602,12 +712,6 @@
     </Other>
   </CompilerOptions>
   <Debugging>
-    <BreakPoints Count="1">
-      <Item1>
-        <Source Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Line Value="1043"/>
-      </Item1>
-    </BreakPoints>
     <Watches Count="6">
       <Item1>
         <Expression Value="rxTit.FCaption"/>
diff --git a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
index 3daf092c2..897c2ad3b 100644
--- a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -1,19 +1,19 @@
 object RxDBGridMainForm: TRxDBGridMainForm
   Left = 325
   Height = 786
-  Top = 177
+  Top = 84
   Width = 1012
   ActiveControl = Panel1
   Caption = 'RxDBGrid Demo'
-  ClientHeight = 761
+  ClientHeight = 759
   ClientWidth = 1012
   Menu = MainMenu1
   OnCreate = FormCreate
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object RxDBGrid1: TRxDBGrid
     Left = 0
-    Height = 692
-    Top = 69
+    Height = 695
+    Top = 64
     Width = 1012
     TitleButtons = True
     AutoSort = True
@@ -54,6 +54,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
       end    
       item
         Title.Alignment = taCenter
+        Title.Caption = 'Developer'
         Title.Orientation = toHorizontal
         Width = 136
         FieldName = 'Developer'
@@ -109,6 +110,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
       end    
       item
         Title.Alignment = taCenter
+        Title.Caption = 'DEVELOPER_ID'
         Title.Orientation = toHorizontal
         Width = 141
         FieldName = 'DEVELOPER_ID'
@@ -156,6 +158,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
     FooterRowCount = 1
     OnFiltred = RxDBGrid1Filtred
     Align = alClient
+    Color = clWindow
+    DrawFullLine = True
     FocusColor = clRed
     SelectedColor = clHighlight
     GridLineStyle = psSolid
@@ -169,22 +173,22 @@ object RxDBGridMainForm: TRxDBGridMainForm
   end
   object Panel1: TPanel
     Left = 0
-    Height = 69
+    Height = 64
     Top = 0
     Width = 1012
     Align = alTop
     AutoSize = True
-    ClientHeight = 69
+    ClientHeight = 64
     ClientWidth = 1012
     TabOrder = 1
     object Label1: TLabel
       AnchorSideLeft.Control = Button2
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 260
+      Left = 269
       Height = 18
       Top = 7
-      Width = 36
+      Width = 37
       BorderSpacing.Around = 6
       Caption = 'Mode'
       ParentColor = False
@@ -193,9 +197,9 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Panel1
       AnchorSideTop.Control = Panel1
       Left = 7
-      Height = 29
+      Height = 27
       Top = 7
-      Width = 84
+      Width = 86
       Action = actCalcTotal
       AutoSize = True
       BorderSpacing.Around = 6
@@ -205,10 +209,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Button1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 97
-      Height = 29
+      Left = 99
+      Height = 27
       Top = 7
-      Width = 157
+      Width = 164
       Action = actOptimizeColumnsWidthAll
       AutoSize = True
       BorderSpacing.Around = 6
@@ -219,10 +223,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = CheckBox2
       AnchorSideTop.Side = asrBottom
-      Left = 489
+      Left = 498
       Height = 22
       Top = 35
-      Width = 81
+      Width = 84
       BorderSpacing.Left = 6
       Caption = 'Use filter'
       OnChange = CheckBox1Change
@@ -232,8 +236,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Label1
       AnchorSideTop.Control = Label1
       AnchorSideTop.Side = asrBottom
-      Left = 266
-      Height = 31
+      Left = 275
+      Height = 25
       Top = 31
       Width = 217
       BorderSpacing.Around = 6
@@ -252,10 +256,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = ComboBox1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 489
+      Left = 498
       Height = 22
       Top = 7
-      Width = 129
+      Width = 133
       BorderSpacing.Around = 6
       Caption = 'Auto fill columns'
       OnChange = CheckBox2Change
@@ -265,10 +269,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = CheckBox2
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 624
+      Left = 637
       Height = 22
       Top = 7
-      Width = 117
+      Width = 121
       BorderSpacing.Around = 6
       Caption = 'Show indicator'
       Checked = True
@@ -281,10 +285,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = CheckBox3
       AnchorSideTop.Side = asrBottom
-      Left = 624
+      Left = 637
       Height = 22
       Top = 35
-      Width = 114
+      Width = 116
       BorderSpacing.Around = 6
       Caption = 'Show headers'
       Checked = True
diff --git a/components/rx/images/TRxDBColorBox.png b/components/rx/images/TRxDBColorBox.png
new file mode 100644
index 000000000..3987f0916
Binary files /dev/null and b/components/rx/images/TRxDBColorBox.png differ
diff --git a/components/rx/images/mk_res.bat b/components/rx/images/mk_res.bat
index 4e96aede8..8bdf4c19c 100644
--- a/components/rx/images/mk_res.bat
+++ b/components/rx/images/mk_res.bat
@@ -1,2 +1,2 @@
 del rx.lrs
-c:\lazarus\tools\lazres.exe rx.lrs TDBDateEdit.xpm TRXLookUpEdit.xpm TRxDBCalcEdit.xpm TRxDBLookupCombo.xpm TRxDBGrid.xpm TDualListDialog.xpm TFolderLister.xpm TRxMemoryData.xpm TCURRENCYEDIT.xpm TRXSWITCH.xpm TRXDICE.xpm TRXDBCOMBOBOX.xpm ttoolpanel.xpm trxxpmanifest.xpm TPAGEMANAGER.xpm TRXAPPICON.xpm TSECRETPANEL.xpm TRXLABEL.xpm tautopanel.xpm TRxCalendarGrid.xpm TRxDateEdit.png TRxClock.png TRxSpeedButton.png TRxSpinButton.png TRxSpinEdit.png TRXDBSpinEdit.png TRxTimeEdit.png TRxDBTimeEdit.png TRxDBProgressBar.png TRxDBTrackBar.png TRxLoginDialog.png TRxVersionInfo.png TRxAboutDialog.png TRxDBCurrEdit.png TRxViewsPanel.png
+c:\lazarus\tools\lazres.exe rx.lrs TDBDateEdit.xpm TRXLookUpEdit.xpm TRxDBCalcEdit.xpm TRxDBLookupCombo.xpm TRxDBGrid.xpm TDualListDialog.xpm TFolderLister.xpm TRxMemoryData.xpm TCURRENCYEDIT.xpm TRXSWITCH.xpm TRXDICE.xpm TRXDBCOMBOBOX.xpm ttoolpanel.xpm trxxpmanifest.xpm TPAGEMANAGER.xpm TRXAPPICON.xpm TSECRETPANEL.xpm TRXLABEL.xpm tautopanel.xpm TRxCalendarGrid.xpm TRxDateEdit.png TRxClock.png TRxSpeedButton.png TRxSpinButton.png TRxSpinEdit.png TRXDBSpinEdit.png TRxTimeEdit.png TRxDBTimeEdit.png TRxDBProgressBar.png TRxDBTrackBar.png TRxLoginDialog.png TRxVersionInfo.png TRxAboutDialog.png TRxDBCurrEdit.png TRxViewsPanel.png TRxDBColorBox.png
diff --git a/components/rx/images/mk_res.sh b/components/rx/images/mk_res.sh
index e37d5a6c8..0cf309856 100755
--- a/components/rx/images/mk_res.sh
+++ b/components/rx/images/mk_res.sh
@@ -1,2 +1,2 @@
 rm rx.lrs
-/usr/local/share/lazarus/tools/lazres rx.lrs TDBDateEdit.xpm TRXLookUpEdit.xpm TRxDBCalcEdit.xpm TRxDBLookupCombo.xpm TRxDBGrid.xpm TDualListDialog.xpm TFolderLister.xpm TRxMemoryData.xpm TCURRENCYEDIT.xpm TRXSWITCH.xpm TRXDICE.xpm TRXDBCOMBOBOX.xpm ttoolpanel.xpm trxxpmanifest.xpm TPAGEMANAGER.xpm TRXAPPICON.xpm TSECRETPANEL.xpm TRXLABEL.xpm tautopanel.xpm TRxCalendarGrid.xpm TRxDateEdit.png TRxClock.png TRxSpeedButton.png TRxSpinButton.png TRxSpinEdit.png TRXDBSpinEdit.png TRxTimeEdit.png TRxDBTimeEdit.png TRxDBProgressBar.png TRxDBTrackBar.png TRxLoginDialog.png TRxVersionInfo.png TRxAboutDialog.png TRxDBCurrEdit.png TRxViewsPanel.png
\ No newline at end of file
+/usr/local/share/lazarus/tools/lazres rx.lrs TDBDateEdit.xpm TRXLookUpEdit.xpm TRxDBCalcEdit.xpm TRxDBLookupCombo.xpm TRxDBGrid.xpm TDualListDialog.xpm TFolderLister.xpm TRxMemoryData.xpm TCURRENCYEDIT.xpm TRXSWITCH.xpm TRXDICE.xpm TRXDBCOMBOBOX.xpm ttoolpanel.xpm trxxpmanifest.xpm TPAGEMANAGER.xpm TRXAPPICON.xpm TSECRETPANEL.xpm TRXLABEL.xpm tautopanel.xpm TRxCalendarGrid.xpm TRxDateEdit.png TRxClock.png TRxSpeedButton.png TRxSpinButton.png TRxSpinEdit.png TRXDBSpinEdit.png TRxTimeEdit.png TRxDBTimeEdit.png TRxDBProgressBar.png TRxDBTrackBar.png TRxLoginDialog.png TRxVersionInfo.png TRxAboutDialog.png TRxDBCurrEdit.png TRxViewsPanel.png TRxDBColorBox.png
\ No newline at end of file
diff --git a/components/rx/images/rx.lrs b/components/rx/images/rx.lrs
index d9670e2a4..165bcb8ad 100644
--- a/components/rx/images/rx.lrs
+++ b/components/rx/images/rx.lrs
@@ -641,3 +641,25 @@ LazarusResources.Add('TRxViewsPanel','PNG',[
   +#135's'#31#170#170#155#193'<G'#168#247#30#170#245'O'#173'G'#137'K'#182'4'#204
   +'{'#255#24'<7'#248#2'N'#186#146'B'#24#248#204#194#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('TRxDBColorBox','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0
+  +#0#0#4'sBIT'#8#8#8#8'|'#8'd'#136#0#0#0#9'pHYs'#0#0#14#156#0#0#14#156#1#7#148
+  +'S'#221#0#0#1#151'IDATH'#137#181'U;N'#195'@'#20#156#141#220'F'#177' '#5'G@'
+  +#20' #j'#10'$@'#206#1'@('#5'E:['#208'.'#16#232#0#145'6h'#183'KA'#145'+'#16#9
+  +#16'rH'#133'D'#136#160#200'-'#130#185#128'Y'#138'd-'#175#227'o'#2'#'#173#180
+  +#239#217#158'yo'#188#31#130#9','#203#18'r'#206'9'''#128#240#227'x'#16#146#254
+  +#206#132'\'#8#248'c'#28#167#9'd) '#130'<('#18'O'#28#30#241'('#0#128'm[J2'#28
+  +#171#8#219#146'l'#19#177',K0'#198#21'R'#25#23#139#203#177#31'6'#26'G'#160#244
+  +'6'#225#249#241'X8'#201'"'#215#29'e'#26#148'6'#149#216#233#246#4#165'M'#1#0
+  +#154#180#132'1'#238#171#203'n'#244#199#235#164#238#1#0#223#219'g'#254#188'\.'
+  +#195#251#17'p'#156#30#0#192#233#246#132#22#180'$lQ^Pz'#138'R'#169#164#228#180
+  +' iRui'#248#248#28'bg'#215#156#202#19#185#28'#-'#210#245'L'#228#158#183#20
+  +#153'7+'#6#136#235#142#132#174'/FZ'#180#183#127#144#185#131'0:'#247#3#152#21
+  +#3'Z'#189'~'#1#198#162'-Z[]'#153'K'#0'HYE'#18#213#234'Bf'#226'v'#251'K'#137
+  +'5'#198#24'l'#219#158'"M'#218'dy'#160#17'BH'#171'u'''#250#253'W?'#201'9''r'
+  +#163'DU'#149'K'#0#0'j'#181#195#200#243#228#253'm03'#177'"'#144#134#173#171
+  +#203#204#132#207#245's%.'#228#171'''?2u'#16#174#234#207#4#214'7'#140#153#137
+  +#31#158#134#233#2#18'7/'#211'gL'#28'N6;J'#252#239#255' '#246#186#11#238#131
+  +'YaV'#140'x'#1'`|a'#204'+'#242#11'3'#175#249#153#208#135's'#214#0#0#0#0'IEND'
+  +#174'B`'#130
+]);
diff --git a/components/rx/registerrxdb.pas b/components/rx/registerrxdb.pas
index 48d9654d9..c764d3931 100644
--- a/components/rx/registerrxdb.pas
+++ b/components/rx/registerrxdb.pas
@@ -41,7 +41,7 @@ uses
 procedure Register;
 implementation
 uses DB, DBPropEdits, rxdbgrid, RxDBSpinEdit, RxDBTimeEdit, RxDBCtrls, rxmemds,
-  ComponentEditors, seldsfrm, PropEdits;
+  ComponentEditors, seldsfrm, PropEdits, RxDBColorBox;
 
 type
 
@@ -117,6 +117,11 @@ begin
   RegisterComponents('RX DBAware',[TRxMemoryData]);
 end;
 
+procedure RegisterRxDBColorBox;
+begin
+  RegisterComponents('RX DBAware',[TRxDBColorBox]);
+end;
+
 procedure Register;
 begin
   RegisterUnit('RxDBTimeEdit', @RegisterRxDBTimeEdit);
@@ -124,6 +129,7 @@ begin
   RegisterUnit('RxDBCtrls', @RegisterRxDBCtrls);
   RegisterUnit('rxdbgrid', @RegisterRxDbGrid);
   RegisterUnit('rxmemds', @RegisterRxMemDS);
+  RegisterUnit('RxDBColorBox', @RegisterRxDBColorBox);
 
   //Component Editors
   RegisterComponentEditor(TRxMemoryData, TMemDataSetEditor);
diff --git a/components/rx/registerrxtools.pas b/components/rx/registerrxtools.pas
index 2e3e68ec7..78b8ef991 100644
--- a/components/rx/registerrxtools.pas
+++ b/components/rx/registerrxtools.pas
@@ -1,3 +1,34 @@
+{ RegisterRxTools unit
+
+  Copyright (C) 2005-2011 Lagunov Aleksey alexs@hotbox.ru and Lazarus team
+  original conception from rx library for Delphi (c)
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version with the following modification:
+
+  As a special exception, the copyright holders of this library give you
+  permission to link this library with independent modules to produce an
+  executable, regardless of the license terms of these independent modules,and
+  to copy and distribute the resulting executable under terms of your choice,
+  provided that you also meet, for each linked independent module, the terms
+  and conditions of the license of that module. An independent module is a
+  module which is not derived from or based on this library. If you modify
+  this library, you may extend this exception to your version of the library,
+  but you are not obligated to do so. If you do not wish to do so, delete this
+  exception statement from your version.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
+  for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+}
+
 unit RegisterRxTools;
 
 {$mode objfpc}{$H+}
diff --git a/components/rx/rx.lrs b/components/rx/rx.lrs
index d9670e2a4..165bcb8ad 100644
--- a/components/rx/rx.lrs
+++ b/components/rx/rx.lrs
@@ -641,3 +641,25 @@ LazarusResources.Add('TRxViewsPanel','PNG',[
   +#135's'#31#170#170#155#193'<G'#168#247#30#170#245'O'#173'G'#137'K'#182'4'#204
   +'{'#255#24'<7'#248#2'N'#186#146'B'#24#248#204#194#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('TRxDBColorBox','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0
+  +#0#0#4'sBIT'#8#8#8#8'|'#8'd'#136#0#0#0#9'pHYs'#0#0#14#156#0#0#14#156#1#7#148
+  +'S'#221#0#0#1#151'IDATH'#137#181'U;N'#195'@'#20#156#141#220'F'#177' '#5'G@'
+  +#20' #j'#10'$@'#206#1'@('#5'E:['#208'.'#16#232#0#145'6h'#183'KA'#145'+'#16#9
+  +#16'rH'#133'D'#136#160#200'-'#130#185#128'Y'#138'd-'#175#227'o'#2'#'#173#180
+  +#239#217#158'yo'#188#31#130#9','#203#18'r'#206'9'''#128#240#227'x'#16#146#254
+  +#206#132'\'#8#248'c'#28#167#9'd) '#130'<('#18'O'#28#30#241'('#0#128'm[J2'#28
+  +#171#8#219#146'l'#19#177',K0'#198#21'R'#25#23#139#203#177#31'6'#26'G'#160#244
+  +'6'#225#249#241'X8'#201'"'#215#29'e'#26#148'6'#149#216#233#246#4#165'M'#1#0
+  +#154#180#132'1'#238#171#203'n'#244#199#235#164#238#1#0#223#219'g'#254#188'\.'
+  +#195#251#17'p'#156#30#0#192#233#246#132#22#180'$lQ^Pz'#138'R'#169#164#228#180
+  +' iRui'#248#248#28'bg'#215#156#202#19#185#28'#-'#210#245'L'#228#158#183#20
+  +#153'7+'#6#136#235#142#132#174'/FZ'#180#183#127#144#185#131'0:'#247#3#152#21
+  +#3'Z'#189'~'#1#198#162'-Z[]'#153'K'#0'HYE'#18#213#234'Bf'#226'v'#251'K'#137
+  +'5'#198#24'l'#219#158'"M'#218'dy'#160#17'BH'#171'u'''#250#253'W?'#201'9''r'
+  +#163'DU'#149'K'#0#0'j'#181#195#200#243#228#253'm03'#177'"'#144#134#173#171
+  +#203#204#132#207#245's%.'#228#171'''?2u'#16#174#234#207#4#214'7'#140#153#137
+  +#31#158#134#233#2#18'7/'#211'gL'#28'N6;J'#252#239#255' '#246#186#11#238#131
+  +'YaV'#140'x'#1'`|a'#204'+'#242#11'3'#175#249#153#208#135's'#214#0#0#0#0'IEND'
+  +#174'B`'#130
+]);
diff --git a/components/rx/rxdbspinedit.pas b/components/rx/rxdbspinedit.pas
index cdf8a92d2..7339578d1 100644
--- a/components/rx/rxdbspinedit.pas
+++ b/components/rx/rxdbspinedit.pas
@@ -255,9 +255,9 @@ end;
 
 function TCustomRxDBSpinEdit.IsReadOnly: boolean;
 begin
-  result := true;
-  if FDatalink.Active and not Self.ReadOnly then
-    result := (Field=nil) or Field.ReadOnly;
+  Result := true;
+  if FDatalink.Active and (not Self.ReadOnly) then
+    Result := (Field = nil) or Field.ReadOnly;
 end;
 
 procedure TCustomRxDBSpinEdit.Loaded;
diff --git a/components/rx/rxnew.lpk b/components/rx/rxnew.lpk
index a8068c096..4cebbd6e4 100644
--- a/components/rx/rxnew.lpk
+++ b/components/rx/rxnew.lpk
@@ -5,7 +5,7 @@
     <Name Value="rxnew"/>
     <Author Value="Lagunov Aleksey"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="10"/>
       <PathDelim Value="\"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
@@ -27,7 +27,7 @@ translate to Lazarus by alexs in 2005 - 2009
     <License Value="free ware
 "/>
     <Version Major="2" Minor="1" Release="2" Build="105"/>
-    <Files Count="57">
+    <Files Count="58">
       <Item1>
         <Filename Value="rxlookup.pas"/>
         <UnitName Value="rxlookup"/>
@@ -259,6 +259,10 @@ translate to Lazarus by alexs in 2005 - 2009
         <HasRegisterProc Value="True"/>
         <UnitName Value="registerrxtools"/>
       </Item57>
+      <Item58>
+        <Filename Value="rxdbcolorbox.pas"/>
+        <UnitName Value="RxDBColorBox"/>
+      </Item58>
     </Files>
     <LazDoc Paths="docs\;\usr\local\share\lazarus\components\rxnew\docs\"/>
     <i18n>
@@ -266,20 +270,24 @@ translate to Lazarus by alexs in 2005 - 2009
       <OutDir Value="languages"/>
     </i18n>
     <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="4">
+    <RequiredPkgs Count="5">
       <Item1>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
+        <PackageName Value="LCLBase"/>
+        <MinVersion Major="1" Release="1" Valid="True"/>
       </Item1>
       <Item2>
-        <PackageName Value="IDEIntf"/>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
       </Item2>
       <Item3>
-        <PackageName Value="LCL"/>
+        <PackageName Value="IDEIntf"/>
       </Item3>
       <Item4>
-        <PackageName Value="rx"/>
+        <PackageName Value="LCL"/>
       </Item4>
+      <Item5>
+        <PackageName Value="rx"/>
+      </Item5>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)\"/>
diff --git a/components/rx/rxnew.pas b/components/rx/rxnew.pas
index c68cf41c1..d7107d551 100644
--- a/components/rx/rxnew.pas
+++ b/components/rx/rxnew.pas
@@ -7,7 +7,7 @@ unit rxnew;
 interface
 
 uses
-    rxlookup, vclutils, dateutil, dbutils, rxapputils, rxdconst, rxstrutils, 
+  rxlookup, vclutils, dateutil, dbutils, rxapputils, rxdconst, rxstrutils, 
   dbdateedit, registerrx, curredit, folderlister, rxdbgrid, rxmemds, duallist, 
   boxprocs, tooledit, rxswitch, rxdice, rxdbcomb, rxtoolbar, rxtbrsetup, 
   fduallst, rxxpman, pagemngr, rxappicon, seldsfrm, rxctrls, rxlogin, 
@@ -16,7 +16,7 @@ uses
   rxspin, RxDBSpinEdit, RegisterRxDB, RxTimeEdit, RxDBTimeEdit, RxDBCtrls, 
   rxfilterby, rxconst, rxFileUtils, RxVersInfo, RxAboutDialog, 
   rxAboutFormUnit, dbcurredit, RxViewsPanel, RxSystemServices, 
-  RegisterRxTools, LazarusPackageIntf;
+  RegisterRxTools, RxDBColorBox, LazarusPackageIntf;
 
 implementation