diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index a4974dad3..056d69400 100644
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -55,13 +55,13 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="117">
+    <Units Count="118">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="47" Y="18"/>
-        <UsageCount Value="103"/>
+        <UsageCount Value="104"/>
       </Unit0>
       <Unit1>
         <Filename Value="rxdbgridmainunit.pas"/>
@@ -70,10 +70,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGridMainUnit"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="202"/>
-        <CursorPos Y="225"/>
-        <UsageCount Value="103"/>
+        <TopLine Value="43"/>
+        <CursorPos X="86" Y="101"/>
+        <UsageCount Value="104"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -98,9 +97,9 @@
       <Unit5>
         <Filename Value="../../rxdbgrid.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="867"/>
-        <CursorPos Y="891"/>
-        <UsageCount Value="18"/>
+        <TopLine Value="6655"/>
+        <CursorPos X="7" Y="6673"/>
+        <UsageCount Value="19"/>
         <Bookmarks Count="2">
           <Item0 Y="2575" ID="2"/>
           <Item1 Y="3778" ID="1"/>
@@ -433,10 +432,11 @@
       <Unit58>
         <Filename Value="../../../../lcl/dbgrids.pas"/>
         <UnitName Value="DBGrids"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="510"/>
+        <TopLine Value="512"/>
         <CursorPos Y="546"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
       </Unit58>
       <Unit59>
@@ -806,8 +806,13 @@
         <CursorPos Y="503"/>
         <UsageCount Value="10"/>
       </Unit116>
+      <Unit117>
+        <Filename Value="../../rxdbgrid.lrs"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit117>
     </Units>
-    <JumpHistory Count="7" HistoryIndex="6">
+    <JumpHistory Count="10" HistoryIndex="9">
       <Position1>
         <Filename Value="../../rxdbgrid.pas"/>
         <Caret Line="518" Column="3" TopLine="441"/>
@@ -834,8 +839,20 @@
       </Position6>
       <Position7>
         <Filename Value="rxdbgridmainunit.pas"/>
-        <Caret Line="225" Column="26" TopLine="202"/>
+        <Caret Line="225" TopLine="202"/>
       </Position7>
+      <Position8>
+        <Filename Value="rxdbgridmainunit.pas"/>
+        <Caret Line="101" Column="86" TopLine="43"/>
+      </Position8>
+      <Position9>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="545" Column="3" TopLine="396"/>
+      </Position9>
+      <Position10>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="1794" Column="3" TopLine="1792"/>
+      </Position10>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
index d01aae4a2..b22e7ccec 100644
--- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -1,11 +1,11 @@
 object RxDBGridMainForm: TRxDBGridMainForm
   Left = 287
-  Height = 721
-  Top = 148
+  Height = 732
+  Top = 137
   Width = 1151
   ActiveControl = Panel1
   Caption = 'RxDBGrid Demo'
-  ClientHeight = 693
+  ClientHeight = 704
   ClientWidth = 1151
   Menu = MainMenu1
   OnCreate = FormCreate
@@ -14,7 +14,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
   LCLVersion = '1.7'
   object RxDBGrid1: TRxDBGrid
     Left = 0
-    Height = 623
+    Height = 634
     Top = 70
     Width = 1151
     ColumnDefValues.BlobText = '(примечание)'
@@ -237,6 +237,27 @@ object RxDBGridMainForm: TRxDBGridMainForm
             }
             Hint = 'Вторая кнопка'
             OnClick = TRxColumnEditButtons1Click
+          end        
+          item
+            Glyph.Data = {
+              C6010000424DC60100000000000036000000280000000A0000000A0000000100
+              2000000000009001000064000000640000000000000000000000000000000000
+              0000000000000000000000000000000000000000000000000000000000000000
+              0000000000000000000000000000000000000000000000000000000000000000
+              0000000000000000000000000000000000000000000000000000808080FFFFFF
+              FFFF000000000000000000000000000000000000000000000000000000008080
+              80FF0000000000000000FFFFFFFF000000000000000000000000000000000000
+              000000000000808080FF0000000000000000FFFFFFFF00000000000000000000
+              00000000000000000000808080FF00000000000000000000000000000000FFFF
+              FFFF00000000000000000000000000000000808080FF00000000000000000000
+              000000000000FFFFFFFF000000000000000000000000808080FF000000000000
+              000000000000000000000000000000000000FFFFFFFF00000000000000008080
+              80FF808080FF808080FF808080FF808080FF808080FF808080FFFFFFFFFF0000
+              0000000000000000000000000000000000000000000000000000000000000000
+              00000000000000000000
+            }
+            Hint = 'Style "PlusRx"'
+            Style = ebsPlusRx
           end>
         Filter.Font.Style = [fsItalic]
         Filter.DropDownRows = 0
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
index 27f83846a..f69498135 100644
--- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
+++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
@@ -98,7 +98,7 @@ var
 
 procedure LocalizeApp;
 implementation
-uses rxsortmemds, FileUtil, gettext, translations, rxFileUtils;
+uses rxsortmemds, FileUtil, gettext, translations, rxFileUtils, LazFileUtils, LazUTF8;
 
 procedure LocalizeApp;
 var
diff --git a/components/rx/trunk/docs/rxcloseformvalidator.xml b/components/rx/trunk/docs/rxcloseformvalidator.xml
index be9be05fe..906fb44b5 100644
--- a/components/rx/trunk/docs/rxcloseformvalidator.xml
+++ b/components/rx/trunk/docs/rxcloseformvalidator.xml
@@ -5,7 +5,7 @@
       </element><element name="TValidateItem.SetFocus"><short>Метод установит фокус клавиатурного ввода в проверяемые контрол</short>
       </element><element name="TValidateItem.Control"><short>Контрол, в котором происходт проверка введённых данных</short>
       </element><element name="TValidateItem.Enabled"><short>Признак необходимости выполнять проверку казанного контрола</short>
-      </element><element name="TValidateItem.FieldCaption"><short>Эаголовок проверяемого контрола</short><descr><p>Эаголовок проверяемого контрола</p><p>Используется при формировании сообщения об ошибке</p>
+      </element><element name="TValidateItem.FieldCaption"><short>Заголовок проверяемого контрола</short><descr><p>Эаголовок проверяемого контрола</p><p>Используется при формировании сообщения об ошибке</p>
         </descr>
       </element><element name="TValidateItem.OnValidate"><short>Событие для ручной проверки допустимости введённых данных</short>
       </element><element name="TValidateItems"><short>Колекция элементов проверки введённых данных</short>
@@ -14,9 +14,11 @@
         </descr>
       </element><element name="TRxCloseFormValidator.ByControl.AControl"><short>Поиск элемента проверки по указателю на контрол</short>
       </element><element name="TRxCloseFormValidator.ErrorMsgCaption"><short>Общая маска сообщения об ошибке</short>
-      </element><element name="TRxCloseFormValidator.Items"><short>Колекция элементов проверки введённых данных</short>
+      </element><element name="TRxCloseFormValidator.Items"><short>Список элементов проверки введённых данных</short>
       </element><element name="TRxCloseFormValidator.IgnoreDisabled"><short>Признак того, что запрещённые контролы проверки не подлежат </short>
       </element>
+    <element name="TRxCloseFormValidator.ByControl"><short>Метод возвращает проверяемый элемент по указанному контролу</short><descr>Прменяется при ручном управлении включением/выключением проведения проверок</descr>
+      </element>
     </module>
   </package>
 </fpdoc-descriptions>
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index 52f3fb745..b1717026f 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -25,7 +25,7 @@ translate to Lazarus by alexs in 2005 - 2016
 "/>
     <License Value="LGPL"/>
     <Version Major="2" Minor="8" Release="3" Build="183"/>
-    <Files Count="74">
+    <Files Count="71">
       <Item1>
         <Filename Value="autopanel.pas"/>
         <UnitName Value="AutoPanel"/>
@@ -39,312 +39,303 @@ translate to Lazarus by alexs in 2005 - 2016
         <UnitName Value="curredit"/>
       </Item3>
       <Item4>
-        <Filename Value="dateutil.pas"/>
-        <UnitName Value="dateutil"/>
-      </Item4>
-      <Item5>
         <Filename Value="dbcurredit.pas"/>
         <UnitName Value="dbcurredit"/>
-      </Item5>
-      <Item6>
+      </Item4>
+      <Item5>
         <Filename Value="dbdateedit.pas"/>
         <UnitName Value="dbdateedit"/>
-      </Item6>
-      <Item7>
+      </Item5>
+      <Item6>
         <Filename Value="dbutils.pas"/>
         <UnitName Value="dbutils"/>
-      </Item7>
-      <Item8>
+      </Item6>
+      <Item7>
         <Filename Value="duallist.pas"/>
         <UnitName Value="duallist"/>
-      </Item8>
-      <Item9>
+      </Item7>
+      <Item8>
         <Filename Value="fduallst.pas"/>
         <UnitName Value="fduallst"/>
-      </Item9>
-      <Item10>
+      </Item8>
+      <Item9>
         <Filename Value="folderlister.pas"/>
         <UnitName Value="folderlister"/>
-      </Item10>
-      <Item11>
+      </Item9>
+      <Item10>
         <Filename Value="pagemngr.pas"/>
         <UnitName Value="pagemngr"/>
-      </Item11>
-      <Item12>
+      </Item10>
+      <Item11>
         <Filename Value="pickdate.pas"/>
         <UnitName Value="pickdate"/>
-      </Item12>
-      <Item13>
+      </Item11>
+      <Item12>
         <Filename Value="pickdate.lrs"/>
         <Type Value="LRS"/>
-      </Item13>
-      <Item14>
+      </Item12>
+      <Item13>
         <Filename Value="registerrx.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="registerrx"/>
-      </Item14>
-      <Item15>
+      </Item13>
+      <Item14>
         <Filename Value="registerrxdb.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="RegisterRxDB"/>
-      </Item15>
-      <Item16>
+      </Item14>
+      <Item15>
         <Filename Value="registerrxtools.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="RegisterRxTools"/>
-      </Item16>
-      <Item17>
+      </Item15>
+      <Item16>
         <Filename Value="rx.inc"/>
         <Type Value="Include"/>
-      </Item17>
-      <Item18>
+      </Item16>
+      <Item17>
         <Filename Value="rxaboutdialog.pas"/>
         <UnitName Value="RxAboutDialog"/>
-      </Item18>
-      <Item19>
+      </Item17>
+      <Item18>
         <Filename Value="rxaboutformunit.pas"/>
         <UnitName Value="rxAboutFormUnit"/>
-      </Item19>
-      <Item20>
+      </Item18>
+      <Item19>
         <Filename Value="rxappicon.pas"/>
         <UnitName Value="rxappicon"/>
-      </Item20>
-      <Item21>
+      </Item19>
+      <Item20>
         <Filename Value="rxapputils.pas"/>
         <UnitName Value="rxapputils"/>
-      </Item21>
-      <Item22>
+      </Item20>
+      <Item21>
         <Filename Value="rxclock.pas"/>
         <UnitName Value="rxclock"/>
-      </Item22>
-      <Item23>
-        <Filename Value="rxconfigvalues.pas"/>
-        <UnitName Value="rxConfigValues"/>
-      </Item23>
-      <Item24>
+      </Item21>
+      <Item22>
         <Filename Value="rxconst.pas"/>
         <UnitName Value="rxconst"/>
-      </Item24>
-      <Item25>
+      </Item22>
+      <Item23>
         <Filename Value="rxctrls.pas"/>
         <UnitName Value="rxctrls"/>
-      </Item25>
-      <Item26>
+      </Item23>
+      <Item24>
         <Filename Value="rxcustomchartpanel.pas"/>
         <UnitName Value="rxcustomchartpanel"/>
-      </Item26>
-      <Item27>
+      </Item24>
+      <Item25>
         <Filename Value="rxdbcolorbox.pas"/>
         <UnitName Value="RxDBColorBox"/>
-      </Item27>
-      <Item28>
+      </Item25>
+      <Item26>
         <Filename Value="rxdbcomb.pas"/>
         <UnitName Value="rxdbcomb"/>
-      </Item28>
-      <Item29>
+      </Item26>
+      <Item27>
         <Filename Value="rxdbctrls.pas"/>
         <UnitName Value="RxDBCtrls"/>
-      </Item29>
-      <Item30>
+      </Item27>
+      <Item28>
         <Filename Value="rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
-      </Item30>
-      <Item31>
+      </Item28>
+      <Item29>
         <Filename Value="rxdbgrid.lrs"/>
         <Type Value="LRS"/>
-      </Item31>
-      <Item32>
+      </Item29>
+      <Item30>
         <Filename Value="rxdbgrid_columsunit.pas"/>
         <UnitName Value="rxdbgrid_columsunit"/>
-      </Item32>
-      <Item33>
+      </Item30>
+      <Item31>
         <Filename Value="rxdbgrid_findunit.pas"/>
         <UnitName Value="rxdbgrid_findunit"/>
-      </Item33>
-      <Item34>
+      </Item31>
+      <Item32>
         <Filename Value="rxdbspinedit.pas"/>
         <UnitName Value="RxDBSpinEdit"/>
-      </Item34>
-      <Item35>
+      </Item32>
+      <Item33>
         <Filename Value="rxdbtimeedit.pas"/>
         <UnitName Value="RxDBTimeEdit"/>
-      </Item35>
-      <Item36>
+      </Item33>
+      <Item34>
         <Filename Value="rxdconst.pas"/>
         <UnitName Value="rxdconst"/>
-      </Item36>
-      <Item37>
+      </Item34>
+      <Item35>
         <Filename Value="rxdice.pas"/>
         <UnitName Value="rxdice"/>
-      </Item37>
-      <Item38>
+      </Item35>
+      <Item36>
         <Filename Value="rxfileutils.pas"/>
         <UnitName Value="rxFileUtils"/>
-      </Item38>
-      <Item39>
+      </Item36>
+      <Item37>
         <Filename Value="rxfilterby.pas"/>
         <UnitName Value="rxfilterby"/>
-      </Item39>
-      <Item40>
+      </Item37>
+      <Item38>
         <Filename Value="rxiconv.pas"/>
         <UnitName Value="rxiconv"/>
-      </Item40>
-      <Item41>
+      </Item38>
+      <Item39>
         <Filename Value="rxlogin.pas"/>
         <UnitName Value="rxlogin"/>
-      </Item41>
-      <Item42>
+      </Item39>
+      <Item40>
         <Filename Value="rxlookup.pas"/>
         <UnitName Value="rxlookup"/>
-      </Item42>
-      <Item43>
+      </Item40>
+      <Item41>
         <Filename Value="rxmemds.pas"/>
         <UnitName Value="rxmemds"/>
-      </Item43>
-      <Item44>
+      </Item41>
+      <Item42>
         <Filename Value="rxpopupunit.pas"/>
         <UnitName Value="rxpopupunit"/>
-      </Item44>
-      <Item45>
+      </Item42>
+      <Item43>
         <Filename Value="rxsortmemds.pas"/>
         <UnitName Value="rxsortmemds"/>
-      </Item45>
-      <Item46>
+      </Item43>
+      <Item44>
         <Filename Value="rxspin.pas"/>
         <UnitName Value="rxspin"/>
-      </Item46>
-      <Item47>
-        <Filename Value="rxstrutils.pas"/>
-        <UnitName Value="rxstrutils"/>
-      </Item47>
-      <Item48>
+      </Item44>
+      <Item45>
         <Filename Value="rxswitch.pas"/>
         <UnitName Value="rxswitch"/>
-      </Item48>
-      <Item49>
+      </Item45>
+      <Item46>
         <Filename Value="rxsystemservices.pas"/>
         <UnitName Value="RxSystemServices"/>
-      </Item49>
-      <Item50>
+      </Item46>
+      <Item47>
         <Filename Value="rxtbrsetup.pas"/>
         <UnitName Value="rxtbrsetup"/>
-      </Item50>
-      <Item51>
+      </Item47>
+      <Item48>
         <Filename Value="rxtimeedit.pas"/>
         <UnitName Value="RxTimeEdit"/>
-      </Item51>
-      <Item52>
+      </Item48>
+      <Item49>
         <Filename Value="rxtoolbar.pas"/>
         <UnitName Value="rxtoolbar"/>
-      </Item52>
-      <Item53>
+      </Item49>
+      <Item50>
         <Filename Value="rxversinfo.pas"/>
         <UnitName Value="RxVersInfo"/>
-      </Item53>
-      <Item54>
+      </Item50>
+      <Item51>
         <Filename Value="rxviewspanel.pas"/>
         <UnitName Value="RxViewsPanel"/>
-      </Item54>
-      <Item55>
+      </Item51>
+      <Item52>
         <Filename Value="rxxpman.pas"/>
         <UnitName Value="rxxpman"/>
-      </Item55>
-      <Item56>
+      </Item52>
+      <Item53>
         <Filename Value="seldsfrm.pas"/>
         <UnitName Value="seldsfrm"/>
-      </Item56>
-      <Item57>
+      </Item53>
+      <Item54>
         <Filename Value="tooledit.pas"/>
         <UnitName Value="tooledit"/>
-      </Item57>
-      <Item58>
+      </Item54>
+      <Item55>
         <Filename Value="vclutils.pas"/>
         <UnitName Value="vclutils"/>
-      </Item58>
-      <Item59>
+      </Item55>
+      <Item56>
         <Filename Value="rxcloseformvalidator.pas"/>
         <UnitName Value="RxCloseFormValidator"/>
-      </Item59>
-      <Item60>
+      </Item56>
+      <Item57>
         <Filename Value="rxhistorynavigator.pas"/>
         <UnitName Value="RxHistoryNavigator"/>
-      </Item60>
-      <Item61>
+      </Item57>
+      <Item58>
         <Filename Value="ex_rx_bin_datapacket.pas"/>
         <UnitName Value="ex_rx_bin_datapacket"/>
-      </Item61>
-      <Item62>
+      </Item58>
+      <Item59>
         <Filename Value="ex_rx_datapacket.pas"/>
         <UnitName Value="ex_rx_datapacket"/>
-      </Item62>
-      <Item63>
+      </Item59>
+      <Item60>
         <Filename Value="ex_rx_xml_datapacket.pas"/>
         <UnitName Value="ex_rx_xml_datapacket"/>
-      </Item63>
-      <Item64>
+      </Item60>
+      <Item61>
         <Filename Value="rxsortby.lfm"/>
         <Type Value="LFM"/>
-      </Item64>
-      <Item65>
+      </Item61>
+      <Item62>
         <Filename Value="rxsortby.pas"/>
         <UnitName Value="rxsortby"/>
-      </Item65>
-      <Item66>
+      </Item62>
+      <Item63>
         <Filename Value="rxmdi.pas"/>
         <UnitName Value="RxMDI"/>
-      </Item66>
-      <Item67>
+      </Item63>
+      <Item64>
         <Filename Value="rxinipropstorage.pas"/>
         <UnitName Value="RxIniPropStorage"/>
-      </Item67>
-      <Item68>
+      </Item64>
+      <Item65>
         <Filename Value="rx_lcl.res"/>
         <Type Value="Binary"/>
-      </Item68>
-      <Item69>
+      </Item65>
+      <Item66>
         <Filename Value="rxdaterangeeditunit.pas"/>
         <UnitName Value="rxDateRangeEditUnit"/>
-      </Item69>
-      <Item70>
+      </Item66>
+      <Item67>
         <Filename Value="rxdbgridfootertools.pas"/>
         <UnitName Value="RxDBGridFooterTools"/>
-      </Item70>
-      <Item71>
+      </Item67>
+      <Item68>
         <Filename Value="rxdbgridfootertools_setup.lfm"/>
         <Type Value="LFM"/>
-      </Item71>
-      <Item72>
+      </Item68>
+      <Item69>
         <Filename Value="rxdbgridfootertools_setup.pas"/>
         <UnitName Value="rxdbgridfootertools_setup"/>
-      </Item72>
-      <Item73>
+      </Item69>
+      <Item70>
         <Filename Value="rxshortcutunit.lfm"/>
         <Type Value="LFM"/>
-      </Item73>
-      <Item74>
+      </Item70>
+      <Item71>
         <Filename Value="rxshortcutunit.pas"/>
         <UnitName Value="rxShortCutUnit"/>
-      </Item74>
+      </Item71>
     </Files>
     <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
     <i18n>
       <EnableI18N Value="True"/>
       <OutDir Value="languages"/>
     </i18n>
-    <RequiredPkgs Count="4">
+    <RequiredPkgs Count="5">
       <Item1>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
+        <PackageName Value="rxtools"/>
       </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/trunk/rxnew.pas b/components/rx/trunk/rxnew.pas
index b5d479dd6..7f6562933 100644
--- a/components/rx/trunk/rxnew.pas
+++ b/components/rx/trunk/rxnew.pas
@@ -8,19 +8,19 @@ unit rxnew;
 interface
 
 uses
-  AutoPanel, boxprocs, curredit, dateutil, dbcurredit, dbdateedit, dbutils, 
-  duallist, fduallst, folderlister, pagemngr, pickdate, registerrx, 
-  RegisterRxDB, RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, 
-  rxapputils, rxclock, rxConfigValues, rxconst, rxctrls, rxcustomchartpanel, 
-  RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid, rxdbgrid_columsunit, 
-  rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit, rxdconst, rxdice, 
-  rxFileUtils, rxfilterby, rxiconv, rxlogin, rxlookup, rxmemds, rxpopupunit, 
-  rxsortmemds, rxspin, rxstrutils, rxswitch, RxSystemServices, rxtbrsetup, 
-  RxTimeEdit, rxtoolbar, RxVersInfo, RxViewsPanel, rxxpman, seldsfrm, 
-  tooledit, vclutils, RxCloseFormValidator, RxHistoryNavigator, 
-  ex_rx_bin_datapacket, ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby, 
-  RxMDI, RxIniPropStorage, rxDateRangeEditUnit, RxDBGridFooterTools, 
-  rxdbgridfootertools_setup, rxShortCutUnit, LazarusPackageIntf;
+  AutoPanel, boxprocs, curredit, dbcurredit, dbdateedit, dbutils, duallist, 
+  fduallst, folderlister, pagemngr, pickdate, registerrx, RegisterRxDB, 
+  RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, rxapputils, 
+  rxclock, rxconst, rxctrls, rxcustomchartpanel, RxDBColorBox, rxdbcomb, 
+  RxDBCtrls, rxdbgrid, rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, 
+  RxDBTimeEdit, rxdconst, rxdice, rxFileUtils, rxfilterby, rxiconv, rxlogin, 
+  rxlookup, rxmemds, rxpopupunit, rxsortmemds, rxspin, rxswitch, 
+  RxSystemServices, rxtbrsetup, RxTimeEdit, rxtoolbar, RxVersInfo, 
+  RxViewsPanel, rxxpman, seldsfrm, tooledit, vclutils, RxCloseFormValidator, 
+  RxHistoryNavigator, ex_rx_bin_datapacket, ex_rx_datapacket, 
+  ex_rx_xml_datapacket, rxsortby, RxMDI, RxIniPropStorage, 
+  rxDateRangeEditUnit, RxDBGridFooterTools, rxdbgridfootertools_setup, 
+  rxShortCutUnit, LazarusPackageIntf;
 
 implementation
 
diff --git a/components/rx/trunk/rxtools.lpk b/components/rx/trunk/rxtools.lpk
new file mode 100644
index 000000000..eb2c7aa77
--- /dev/null
+++ b/components/rx/trunk/rxtools.lpk
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <Package Version="4">
+    <Name Value="rxtools"/>
+    <Type Value="RunAndDesignTime"/>
+    <CompilerOptions>
+      <Version Value="11"/>
+      <SearchPaths>
+        <OtherUnitFiles Value="."/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+      </SearchPaths>
+    </CompilerOptions>
+    <Files Count="3">
+      <Item1>
+        <Filename Value="rxconfigvalues.pas"/>
+        <UnitName Value="rxConfigValues"/>
+      </Item1>
+      <Item2>
+        <Filename Value="rxstrutils.pas"/>
+        <UnitName Value="rxstrutils"/>
+      </Item2>
+      <Item3>
+        <Filename Value="dateutil.pas"/>
+        <UnitName Value="dateutil"/>
+      </Item3>
+    </Files>
+    <RequiredPkgs Count="1">
+      <Item1>
+        <PackageName Value="FCL"/>
+      </Item1>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/rx/trunk/rxtools.pas b/components/rx/trunk/rxtools.pas
new file mode 100644
index 000000000..db2336d1d
--- /dev/null
+++ b/components/rx/trunk/rxtools.pas
@@ -0,0 +1,21 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit rxtools;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+  rxConfigValues, rxstrutils, dateutil, LazarusPackageIntf;
+
+implementation
+
+procedure Register;
+begin
+end;
+
+initialization
+  RegisterPackage('rxtools', @Register);
+end.