diff --git a/components/rx/trunk/Demos/FolderLister/FolderLister.lpi b/components/rx/trunk/Demos/FolderLister/FolderLister.lpi
index 3342b8650..4ae10960c 100644
--- a/components/rx/trunk/Demos/FolderLister/FolderLister.lpi
+++ b/components/rx/trunk/Demos/FolderLister/FolderLister.lpi
@@ -49,8 +49,7 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="10"/>
-        <CursorPos Y="53"/>
+        <CursorPos X="12" Y="9"/>
         <UsageCount Value="23"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -170,7 +169,7 @@
       </Position8>
       <Position9>
         <Filename Value="unit1.pas"/>
-        <Caret Line="53" TopLine="25"/>
+        <Caret Line="53" TopLine="20"/>
       </Position9>
     </JumpHistory>
   </ProjectOptions>
diff --git a/components/rx/trunk/Demos/FolderLister/unit1.pas b/components/rx/trunk/Demos/FolderLister/unit1.pas
index ed487cde3..39c0be585 100644
--- a/components/rx/trunk/Demos/FolderLister/unit1.pas
+++ b/components/rx/trunk/Demos/FolderLister/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ActnList,
-  Menus, FolderLister, Buttons, EditBtn, StdCtrls;
+  Menus, rxFolderLister, Buttons, EditBtn, StdCtrls;
 
 type
 
diff --git a/components/rx/trunk/Demos/PhoneBookDemo/PhoneBookDemo.lpi b/components/rx/trunk/Demos/PhoneBookDemo/PhoneBookDemo.lpi
index 4bd66b6c6..7021ec4cf 100644
--- a/components/rx/trunk/Demos/PhoneBookDemo/PhoneBookDemo.lpi
+++ b/components/rx/trunk/Demos/PhoneBookDemo/PhoneBookDemo.lpi
@@ -62,11 +62,9 @@
       <Unit0>
         <Filename Value="PhoneBookDemo.lpr"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="3" Y="12"/>
         <UsageCount Value="27"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="pbmainunit.pas"/>
@@ -75,6 +73,7 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="pbMainUnit"/>
+        <IsVisibleTab Value="True"/>
         <TopLine Value="70"/>
         <CursorPos X="137" Y="84"/>
         <UsageCount Value="27"/>
@@ -101,11 +100,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="pbEditDataUnit"/>
-        <EditorIndex Value="1"/>
-        <TopLine Value="5"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="9"/>
         <CursorPos X="3" Y="42"/>
         <UsageCount Value="25"/>
-        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../rxcloseformvalidator.pas"/>
diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index b52d771a9..2317026a3 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="13">
+    <Units Count="48">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="47" Y="18"/>
-        <UsageCount Value="116"/>
+        <UsageCount Value="117"/>
       </Unit0>
       <Unit1>
         <Filename Value="rxdbgridmainunit.pas"/>
@@ -73,14 +73,13 @@
         <IsVisibleTab Value="True"/>
         <TopLine Value="152"/>
         <CursorPos X="33" Y="171"/>
-        <UsageCount Value="116"/>
+        <UsageCount Value="117"/>
         <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../rxdbgrid.pas"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="2489"/>
+        <TopLine Value="2470"/>
         <CursorPos X="72" Y="2503"/>
         <UsageCount Value="11"/>
       </Unit2>
@@ -88,8 +87,8 @@
         <Filename Value="../../rxdbgridexportspreadsheet.pas"/>
         <UnitName Value="RxDBGridExportSpreadSheet"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="79"/>
-        <CursorPos Y="80"/>
+        <TopLine Value="74"/>
+        <CursorPos X="41" Y="91"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
@@ -110,21 +109,21 @@
       <Unit6>
         <Filename Value="../../registerrx.pas"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="26"/>
-        <CursorPos X="72" Y="59"/>
+        <TopLine Value="156"/>
+        <CursorPos X="47" Y="184"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../rxpickdate.pas"/>
         <EditorIndex Value="-1"/>
-        <CursorPos X="16" Y="32"/>
+        <TopLine Value="246"/>
+        <CursorPos Y="257"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
-        <Filename Value="../../tooledit.pas"/>
+        <Filename Value="../../rxtooledit.pas"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="19"/>
-        <CursorPos X="25" Y="40"/>
+        <CursorPos X="3"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
@@ -135,14 +134,14 @@
         <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
-        <Filename Value="../../dbdateedit.pas"/>
+        <Filename Value="../../rxdbdateedit.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="97"/>
-        <CursorPos X="16" Y="117"/>
+        <CursorPos X="18" Y="32"/>
         <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
-        <Filename Value="../../dbutils.pas"/>
+        <Filename Value="../../rxdbutils.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="145"/>
         <CursorPos X="53" Y="168"/>
@@ -156,17 +155,258 @@
         <CursorPos X="8" Y="150"/>
         <UsageCount Value="10"/>
       </Unit12>
+      <Unit13>
+        <Filename Value="../../rxboxprocs.pas"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit13>
+      <Unit14>
+        <Filename Value="../../rxfduallst.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="22"/>
+        <CursorPos X="16" Y="32"/>
+        <UsageCount Value="10"/>
+      </Unit14>
+      <Unit15>
+        <Filename Value="../../rxduallist.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="72"/>
+        <CursorPos X="35" Y="91"/>
+        <UsageCount Value="10"/>
+      </Unit15>
+      <Unit16>
+        <Filename Value="../../rxtbrsetup.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="74"/>
+        <CursorPos X="38" Y="93"/>
+        <UsageCount Value="10"/>
+      </Unit16>
+      <Unit17>
+        <Filename Value="../../rxceeditlookupfields.pas"/>
+        <UnitName Value="rxceEditLookupFields"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="40"/>
+        <CursorPos X="9" Y="64"/>
+        <UsageCount Value="10"/>
+      </Unit17>
+      <Unit18>
+        <Filename Value="../../register_rxctrl.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="269"/>
+        <CursorPos X="24" Y="301"/>
+        <UsageCount Value="10"/>
+      </Unit18>
+      <Unit19>
+        <Filename Value="../../LazReport/rxlazreport.pas"/>
+        <UnitName Value="RxLazReport"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos X="90" Y="7"/>
+        <UsageCount Value="10"/>
+      </Unit19>
+      <Unit20>
+        <Filename Value="../../LazReport/lrrxcontrols.pas"/>
+        <UnitName Value="lrRxControls"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="122"/>
+        <CursorPos X="74" Y="139"/>
+        <UsageCount Value="10"/>
+      </Unit20>
+      <Unit21>
+        <Filename Value="../../rxvclutils.pas"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit21>
+      <Unit22>
+        <Filename Value="../../rxctrls.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="819"/>
+        <CursorPos X="27" Y="824"/>
+        <UsageCount Value="10"/>
+      </Unit22>
+      <Unit23>
+        <Filename Value="../../rxtoolbar.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="272"/>
+        <CursorPos X="35" Y="281"/>
+        <UsageCount Value="10"/>
+      </Unit23>
+      <Unit24>
+        <Filename Value="../../rxswitch.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="136"/>
+        <CursorPos X="16" Y="157"/>
+        <UsageCount Value="10"/>
+      </Unit24>
+      <Unit25>
+        <Filename Value="../../rxdice.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="16"/>
+        <CursorPos X="49" Y="38"/>
+        <UsageCount Value="10"/>
+      </Unit25>
+      <Unit26>
+        <Filename Value="../../rxclock.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="166"/>
+        <CursorPos X="16" Y="181"/>
+        <UsageCount Value="10"/>
+      </Unit26>
+      <Unit27>
+        <Filename Value="../../rxspin.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="242"/>
+        <CursorPos X="13" Y="245"/>
+        <UsageCount Value="10"/>
+      </Unit27>
+      <Unit28>
+        <Filename Value="../../rxmdi.pas"/>
+        <UnitName Value="RxMDI"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="134"/>
+        <CursorPos Y="160"/>
+        <UsageCount Value="10"/>
+      </Unit28>
+      <Unit29>
+        <Filename Value="../../rxpopupunit.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="233"/>
+        <CursorPos X="6" Y="250"/>
+        <UsageCount Value="10"/>
+      </Unit29>
+      <Unit30>
+        <Filename Value="../../rxlookup.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="13"/>
+        <CursorPos X="23" Y="41"/>
+        <UsageCount Value="10"/>
+      </Unit30>
+      <Unit31>
+        <Filename Value="../../rxdbctrls.pas"/>
+        <UnitName Value="RxDBCtrls"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="187"/>
+        <CursorPos X="29" Y="215"/>
+        <UsageCount Value="10"/>
+      </Unit31>
+      <Unit32>
+        <Filename Value="../../rxdbgridexportpdf.pas"/>
+        <UnitName Value="RxDBGridExportPdf"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="23"/>
+        <CursorPos X="38" Y="40"/>
+        <UsageCount Value="10"/>
+      </Unit32>
+      <Unit33>
+        <Filename Value="../../rxlogin.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="196"/>
+        <CursorPos X="47" Y="209"/>
+        <UsageCount Value="10"/>
+      </Unit33>
+      <Unit34>
+        <Filename Value="../../rxdbgridprintgrid.pas"/>
+        <UnitName Value="RxDBGridPrintGrid"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="22"/>
+        <CursorPos X="24" Y="39"/>
+        <UsageCount Value="10"/>
+      </Unit34>
+      <Unit35>
+        <Filename Value="../../rxseldsfrm.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="61"/>
+        <CursorPos X="16" Y="32"/>
+        <UsageCount Value="10"/>
+      </Unit35>
+      <Unit36>
+        <Filename Value="../../registerrxdb.pas"/>
+        <UnitName Value="RegisterRxDB"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="149"/>
+        <CursorPos X="19" Y="165"/>
+        <UsageCount Value="10"/>
+      </Unit36>
+      <Unit37>
+        <Filename Value="../../rxcurredit.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="113"/>
+        <CursorPos X="3" Y="130"/>
+        <UsageCount Value="10"/>
+      </Unit37>
+      <Unit38>
+        <Filename Value="../../rxdbcurredit.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="25"/>
+        <CursorPos X="18" Y="34"/>
+        <UsageCount Value="10"/>
+      </Unit38>
+      <Unit39>
+        <Filename Value="../../rxfolderlister.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="13"/>
+        <CursorPos X="20" Y="32"/>
+        <UsageCount Value="10"/>
+      </Unit39>
+      <Unit40>
+        <Filename Value="../../rxpagemngr.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="26"/>
+        <CursorPos X="74" Y="49"/>
+        <UsageCount Value="10"/>
+      </Unit40>
+      <Unit41>
+        <Filename Value="../../rxdbgrid_findunit.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="55"/>
+        <CursorPos X="8" Y="72"/>
+        <UsageCount Value="10"/>
+      </Unit41>
+      <Unit42>
+        <Filename Value="../../rxdbspinedit.pas"/>
+        <UnitName Value="RxDBSpinEdit"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="115"/>
+        <CursorPos X="8" Y="132"/>
+        <UsageCount Value="10"/>
+      </Unit42>
+      <Unit43>
+        <Filename Value="../../rxdbtimeedit.pas"/>
+        <UnitName Value="RxDBTimeEdit"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="125"/>
+        <CursorPos X="8" Y="142"/>
+        <UsageCount Value="10"/>
+      </Unit43>
+      <Unit44>
+        <Filename Value="../../rxmemds.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="247"/>
+        <CursorPos X="36" Y="264"/>
+        <UsageCount Value="10"/>
+      </Unit44>
+      <Unit45>
+        <Filename Value="../../rxdbcomb.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="156"/>
+        <CursorPos X="8" Y="173"/>
+        <UsageCount Value="10"/>
+      </Unit45>
+      <Unit46>
+        <Filename Value="../../rxdbgridfootertools_setup.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="52"/>
+        <CursorPos X="8" Y="69"/>
+        <UsageCount Value="10"/>
+      </Unit46>
+      <Unit47>
+        <Filename Value="../../rxxpman.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="14"/>
+        <CursorPos X="6" Y="56"/>
+        <UsageCount Value="10"/>
+      </Unit47>
     </Units>
-    <JumpHistory Count="2" HistoryIndex="1">
-      <Position1>
-        <Filename Value="rxdbgridmainunit.pas"/>
-        <Caret Line="14" Column="134"/>
-      </Position1>
-      <Position2>
-        <Filename Value="rxdbgridmainunit.pas"/>
-        <Caret Line="172" Column="21" TopLine="158"/>
-      </Position2>
-    </JumpHistory>
+    <JumpHistory HistoryIndex="-1"/>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
index 4f4a17b31..5fff030bc 100644
--- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
+++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, rxmemds,
   DB, rxdbgrid, RxAboutDialog, RxIniPropStorage, RxDBGridPrintGrid,
-  RxDBGridExportSpreadSheet, RxDBGridFooterTools, tooledit, RxDBGridExportPdf,
+  RxDBGridExportSpreadSheet, RxDBGridFooterTools, rxtooledit, RxDBGridExportPdf,
   ExtCtrls, Buttons, Menus, ActnList, StdCtrls, DBGrids, Types, Grids;
 
 type
diff --git a/components/rx/trunk/Demos/RxDateEdit/project1.lpi b/components/rx/trunk/Demos/RxDateEdit/project1.lpi
index c07a6679f..5e195e080 100644
--- a/components/rx/trunk/Demos/RxDateEdit/project1.lpi
+++ b/components/rx/trunk/Demos/RxDateEdit/project1.lpi
@@ -55,7 +55,7 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <CursorPos X="34" Y="17"/>
+        <CursorPos X="59" Y="9"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -198,7 +198,7 @@
         <UsageCount Value="10"/>
       </Unit22>
     </Units>
-    <JumpHistory Count="19" HistoryIndex="18">
+    <JumpHistory Count="20" HistoryIndex="19">
       <Position1>
         <Filename Value="unit1.pas"/>
         <Caret Line="46" TopLine="28"/>
@@ -275,6 +275,10 @@
         <Filename Value="unit1.pas"/>
         <Caret Line="17" Column="34"/>
       </Position19>
+      <Position20>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="9" Column="33"/>
+      </Position20>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/Demos/RxDateEdit/unit1.pas b/components/rx/trunk/Demos/RxDateEdit/unit1.pas
index 3deb589c0..6a81cd688 100644
--- a/components/rx/trunk/Demos/RxDateEdit/unit1.pas
+++ b/components/rx/trunk/Demos/RxDateEdit/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, db, FileUtil, LResources, Forms, Controls, Graphics,
-  Dialogs, StdCtrls, rxmemds, dbdateedit, curredit, tooledit;
+  Dialogs, StdCtrls, rxmemds, rxdbdateedit, rxcurredit, rxtooledit;
 
 type
 
diff --git a/components/rx/trunk/Demos/RxLookup/project1.lpi b/components/rx/trunk/Demos/RxLookup/project1.lpi
index 9385c2898..8a1f95e58 100644
--- a/components/rx/trunk/Demos/RxLookup/project1.lpi
+++ b/components/rx/trunk/Demos/RxLookup/project1.lpi
@@ -4,13 +4,13 @@
     <Version Value="9"/>
     <General>
       <MainUnit Value="0"/>
+      <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
     </General>
     <VersionInfo>
       <Language Value=""/>
       <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="default" Default="True"/>
@@ -44,6 +44,8 @@
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="11"/>
         <UsageCount Value="22"/>
       </Unit0>
       <Unit1>
@@ -54,7 +56,7 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="34"/>
+        <TopLine Value="42"/>
         <CursorPos Y="47"/>
         <UsageCount Value="22"/>
         <Loaded Value="True"/>
@@ -62,186 +64,63 @@
       </Unit1>
       <Unit2>
         <Filename Value="../../rxlookup.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="645"/>
         <CursorPos X="19" Y="646"/>
         <UsageCount Value="11"/>
         <Bookmarks Count="1">
           <Item0 Y="1315" ID="1"/>
         </Bookmarks>
-        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../../../lcl/controls.pp"/>
         <UnitName Value="Controls"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="1135"/>
         <CursorPos Y="1152"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../../../lcl/include/control.inc"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="4113"/>
         <CursorPos Y="4129"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="../../rxpopupunit.pas"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="770"/>
         <CursorPos Y="785"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../rxdconst.pas"/>
-        <EditorIndex Value="3"/>
-        <TopLine Value="77"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="68"/>
         <CursorPos X="3" Y="68"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../../../lcl/include/wincontrol.inc"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="7563"/>
         <CursorPos Y="7579"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../dbutils.pas"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="310"/>
         <CursorPos Y="326"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit8>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="1">
       <Position1>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="225" TopLine="209"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="47" TopLine="34"/>
       </Position1>
-      <Position2>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="227" TopLine="211"/>
-      </Position2>
-      <Position3>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="340" TopLine="324"/>
-      </Position3>
-      <Position4>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="341" TopLine="325"/>
-      </Position4>
-      <Position5>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="342" TopLine="326"/>
-      </Position5>
-      <Position6>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="344" TopLine="328"/>
-      </Position6>
-      <Position7>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="345" TopLine="329"/>
-      </Position7>
-      <Position8>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="346" TopLine="330"/>
-      </Position8>
-      <Position9>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="232" TopLine="216"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="227" TopLine="211"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="229" TopLine="213"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="230" TopLine="214"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="235" TopLine="219"/>
-      </Position13>
-      <Position14>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="315" TopLine="299"/>
-      </Position14>
-      <Position15>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="318" TopLine="302"/>
-      </Position15>
-      <Position16>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="321" TopLine="305"/>
-      </Position16>
-      <Position17>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="322" TopLine="306"/>
-      </Position17>
-      <Position18>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="323" TopLine="307"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="324" TopLine="308"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../../dbutils.pas"/>
-        <Caret Line="326" TopLine="310"/>
-      </Position20>
-      <Position21>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1331" TopLine="1315"/>
-      </Position21>
-      <Position22>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1332" TopLine="1316"/>
-      </Position22>
-      <Position23>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1445" TopLine="1429"/>
-      </Position23>
-      <Position24>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1447" TopLine="1431"/>
-      </Position24>
-      <Position25>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1448" TopLine="1432"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1451" TopLine="1435"/>
-      </Position26>
-      <Position27>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1454" TopLine="1438"/>
-      </Position27>
-      <Position28>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1333" TopLine="1317"/>
-      </Position28>
-      <Position29>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1059" TopLine="1043"/>
-      </Position29>
-      <Position30>
-        <Filename Value="../../rxlookup.pas"/>
-        <Caret Line="1060" TopLine="1044"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/Demos/RxLookup/project1.lpr b/components/rx/trunk/Demos/RxLookup/project1.lpr
index f3c004e85..0019e68ff 100644
--- a/components/rx/trunk/Demos/RxLookup/project1.lpr
+++ b/components/rx/trunk/Demos/RxLookup/project1.lpr
@@ -7,13 +7,11 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, Unit1, rxnew, LResources
-  { you can add units after this };
+  Forms, Unit1, rxnew;
 
-{$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}
+{$R *.res}
 
 begin
-  {$I project1.lrs}
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/rx/trunk/Demos/Text90/project1.lpi b/components/rx/trunk/Demos/Text90/project1.lpi
index 73e88ccbe..0f131c35b 100644
--- a/components/rx/trunk/Demos/Text90/project1.lpi
+++ b/components/rx/trunk/Demos/Text90/project1.lpi
@@ -51,8 +51,7 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="49"/>
-        <CursorPos Y="40"/>
+        <CursorPos X="34" Y="9"/>
         <UsageCount Value="26"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -231,7 +230,7 @@
       </Position4>
       <Position5>
         <Filename Value="unit1.pas"/>
-        <Caret Line="40" TopLine="28"/>
+        <Caret Line="40" TopLine="40"/>
       </Position5>
     </JumpHistory>
   </ProjectOptions>
diff --git a/components/rx/trunk/Demos/Text90/unit1.pas b/components/rx/trunk/Demos/Text90/unit1.pas
index d7925a513..7a767a30c 100644
--- a/components/rx/trunk/Demos/Text90/unit1.pas
+++ b/components/rx/trunk/Demos/Text90/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  Buttons, StdCtrls, rxdbgrid, vclutils, rxmemds, db, IniPropStorage;
+  Buttons, StdCtrls, rxdbgrid, rxvclutils, rxmemds, db, IniPropStorage;
 
 type
 
diff --git a/components/rx/trunk/LazReport/lrrxcontrols.pas b/components/rx/trunk/LazReport/lrrxcontrols.pas
index 4fc1566c7..280d28085 100644
--- a/components/rx/trunk/LazReport/lrrxcontrols.pas
+++ b/components/rx/trunk/LazReport/lrrxcontrols.pas
@@ -136,7 +136,7 @@ type
   end;
 
 implementation
-uses DBPropEdits, LR_DBRel, LR_Utils, PropEdits, duallist, rxstrutils, tooledit,
+uses DBPropEdits, LR_DBRel, LR_Utils, PropEdits, rxduallist, rxstrutils, rxtooledit,
   LCLIntf, LCLType, Forms, LR_DBComponent;
 
 
diff --git a/components/rx/trunk/WinXP.manifest b/components/rx/trunk/WinXP.manifest
deleted file mode 100644
index 11b1be573..000000000
--- a/components/rx/trunk/WinXP.manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-        type="win32"
-    name="DelphiApplication"
-    version="1.0.0.0" 
-        processorArchitecture="*"/>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-        type="win32"
-        name="Microsoft.Windows.Common-Controls"
-        version="6.0.0.0"
-        publicKeyToken="6595b64144ccf1df"
-        language="*"
-        processorArchitecture="*"/>
-    </dependentAssembly>
-  </dependency>
-</assembly>
diff --git a/components/rx/trunk/WindowsXP.RES b/components/rx/trunk/WindowsXP.RES
deleted file mode 100644
index 909fc7de1..000000000
Binary files a/components/rx/trunk/WindowsXP.RES and /dev/null differ
diff --git a/components/rx/trunk/WindowsXP.rc b/components/rx/trunk/WindowsXP.rc
deleted file mode 100644
index c3847ff82..000000000
--- a/components/rx/trunk/WindowsXP.rc
+++ /dev/null
@@ -1 +0,0 @@
-1 24 "WinXP.manifest"
diff --git a/components/rx/trunk/fduallst.lrt b/components/rx/trunk/fduallst.lrt
deleted file mode 100644
index c887c8f9c..000000000
--- a/components/rx/trunk/fduallst.lrt
+++ /dev/null
@@ -1,7 +0,0 @@
-TDUALLISTFORM.CAPTION=DualListForm
-TDUALLISTFORM.SRCLABEL.CAPTION=Source
-TDUALLISTFORM.DSTLABEL.CAPTION=Dest
-TDUALLISTFORM.INCBTN.CAPTION=>
-TDUALLISTFORM.INCALLBTN.CAPTION=>>
-TDUALLISTFORM.EXCLBTN.CAPTION=<
-TDUALLISTFORM.EXCLALLBTN.CAPTION=<<
diff --git a/components/rx/trunk/images/mk_res.bat b/components/rx/trunk/images/mk_res.bat
index 46dd4ffc2..9c5047b2e 100644
--- a/components/rx/trunk/images/mk_res.bat
+++ b/components/rx/trunk/images/mk_res.bat
@@ -1,3 +1,3 @@
 del rx.lrs
 del rx.res
-c:\lazarus\tools\lazres.exe rx.res 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 TRxRadioGroup.png TRxDBRadioGroup.png TRxHistoryNavigator.png TRxCloseFormValidator.png TRxIniPropStorage TRxDBGridFooterTools.png TRxDateRangeEdit.png  TRxMDICloseButton.png  TRxMDIPanel.png  TRxMDITasks.png TRxDBGridExportPDF.png
+c:\lazarus\tools\lazres.exe rx.res 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 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 TRxRadioGroup.png TRxDBRadioGroup.png TRxHistoryNavigator.png TRxCloseFormValidator.png TRxIniPropStorage TRxDBGridFooterTools.png TRxDateRangeEdit.png  TRxMDICloseButton.png  TRxMDIPanel.png  TRxMDITasks.png TRxDBGridExportPDF.png
diff --git a/components/rx/trunk/images/mk_res.sh b/components/rx/trunk/images/mk_res.sh
index f7462449c..e769bcec8 100755
--- a/components/rx/trunk/images/mk_res.sh
+++ b/components/rx/trunk/images/mk_res.sh
@@ -1,3 +1,3 @@
 rm rx.lrs
 rm rx.res
-/usr/local/share/lazarus/tools/lazres rx.res TRxDBDateEdit.png 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 TRxRadioGroup.png TRxDBRadioGroup.png TRxHistoryNavigator.png TRxCloseFormValidator.png TRxIniPropStorage.png TRxDBGridFooterTools.png TRxDateRangeEdit.png TRxMDICloseButton.png TRxMDIPanel.png TRxMDITasks.png TRxDBGridExportPDF.png
\ No newline at end of file
+/usr/local/share/lazarus/tools/lazres rx.res TRxDBDateEdit.png TRXLookUpEdit.xpm TRxDBCalcEdit.xpm TRxDBLookupCombo.xpm TRxDBGrid.xpm TDualListDialog.xpm TFolderLister.xpm TRxMemoryData.xpm TCURRENCYEDIT.xpm TRXSWITCH.xpm TRXDICE.xpm TRXDBCOMBOBOX.xpm ttoolpanel.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 TRxRadioGroup.png TRxDBRadioGroup.png TRxHistoryNavigator.png TRxCloseFormValidator.png TRxIniPropStorage.png TRxDBGridFooterTools.png TRxDateRangeEdit.png TRxMDICloseButton.png TRxMDIPanel.png TRxMDITasks.png TRxDBGridExportPDF.png
\ No newline at end of file
diff --git a/components/rx/trunk/images/rx.res b/components/rx/trunk/images/rx.res
index 34952c533..545c2cc7a 100644
Binary files a/components/rx/trunk/images/rx.res and b/components/rx/trunk/images/rx.res differ
diff --git a/components/rx/trunk/images/trxxpmanifest.xpm b/components/rx/trunk/images/trxxpmanifest.xpm
deleted file mode 100644
index 1dd31fa9f..000000000
--- a/components/rx/trunk/images/trxxpmanifest.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char *trxxpmanifest[]={
-"24 24 9 1",
-". c None",
-"# c #000000",
-"c c #000080",
-"a c #00ff00",
-"e c #9d9da1",
-"g c #e0dfe3",
-"b c #ff0000",
-"d c #ffff00",
-"f c #ffffff",
-"........................",
-"........................",
-"....##...##.####........",
-".....##.##..#####.......",
-"......###...##.##.......",
-"......###...#####.......",
-".....#####..####........",
-".....##.##..##..........",
-"....##...##.##..........",
-"........................",
-".####################...",
-".#aaaaaaaaaaaa#b#c#d#e..",
-".####################e..",
-".#ffffffffffffffffff#e..",
-".#ffffffffffffffffff#e..",
-".#ffffffffffffffffff#e..",
-".#ffffffffffffffffff#e..",
-".#ffffggggggfggggggf#e..",
-".#ffffgffff#fgffff#f#e..",
-".#ffffg#####fg#####f#e..",
-".#ffffffffffffffffff#e..",
-".####################e..",
-"..eeeeeeeeeeeeeeeeeeee..",
-"........................"};
diff --git a/components/rx/trunk/register_rxctrl.pas b/components/rx/trunk/register_rxctrl.pas
index 4ea23335c..df5e85818 100644
--- a/components/rx/trunk/register_rxctrl.pas
+++ b/components/rx/trunk/register_rxctrl.pas
@@ -65,7 +65,7 @@ type
 procedure Register;
 implementation
 uses RxLogin, RxAppIcon, Dialogs, rxconst, RxHistoryNavigator, rxpopupunit,
-  rxceEditLookupFields, rxdbgrid, rxdconst, duallist, rxstrutils, Forms;
+  rxceEditLookupFields, rxdbgrid, rxdconst, rxduallist, rxstrutils, Forms;
 
 resourcestring
   sTestTRxLoginDialog = 'Test TRxLoginDialog';
diff --git a/components/rx/trunk/registerrx.pas b/components/rx/trunk/registerrx.pas
index fa2a8a72c..f5751751c 100644
--- a/components/rx/trunk/registerrx.pas
+++ b/components/rx/trunk/registerrx.pas
@@ -46,16 +46,16 @@ procedure Register;
 
 implementation
 uses
-  PropEdits, folderlister, duallist, RxHistoryNavigator,
-  curredit, rxswitch, rxdice, rxtoolbar,
+  PropEdits, rxfolderlister, rxduallist, RxHistoryNavigator,
+  rxcurredit, rxswitch, rxdice, rxtoolbar,
   {$IFDEF USE_TRXXPManifest}
   rxxpman,
   {$ENDIF}
-  PageMngr,
+  rxpagemngr,
   {$IFDEF USE_TRxAppIcon}
   RxAppIcon,
   {$ENDIF}
-  Dialogs, ComponentEditors, DBPropEdits, rxctrls, RxAutoPanel, rxpickdate, tooledit, rxclock,
+  Dialogs, ComponentEditors, DBPropEdits, rxctrls, RxAutoPanel, rxpickdate, rxtooledit, rxclock,
   rxspin, RxTimeEdit, rxDateRangeEditUnit, RxAboutDialog, RxViewsPanel, RxMDI;
 
 {$R rx.res}
@@ -173,15 +173,15 @@ end;
 procedure Register;
 begin
   //RX
-  RegisterUnit('folderlister', @RegisterFolderLister);
-  RegisterUnit('duallist', @RegisterDualList);
-  RegisterUnit('curredit', @RegisterCurrEdit);
+  RegisterUnit('rxfolderlister', @RegisterFolderLister);
+  RegisterUnit('rxduallist', @RegisterDualList);
+  RegisterUnit('rxcurredit', @RegisterCurrEdit);
   RegisterUnit('rxswitch', @RegisterRXSwitch);
   RegisterUnit('rxdice', @RegisterRXDice);
   {$IFDEF USE_TRXXPManifest}
   RegisterUnit('RxXPMan', @RegisterRxXPMan);
   {$ENDIF}
-  RegisterUnit('PageMngr', @RegisterPageMngr);
+  RegisterUnit('rxPageMngr', @RegisterPageMngr);
   RegisterUnit('rxtoolbar', @RegisterRxToolBar);
   {$IFDEF USE_TRxAppIcon}
   RegisterUnit('rxappicon', @RegisterRxAppIcon);
@@ -189,7 +189,7 @@ begin
   RegisterUnit('rxctrls', @RegisterRxCtrls);
   RegisterUnit('RxAutoPanel', @RegisterAutoPanel);
   RegisterUnit('rxpickdate', @RegisterPickDate);
-  RegisterUnit('tooledit', @RegisterToolEdit);
+  RegisterUnit('rxtooledit', @RegisterToolEdit);
   RegisterUnit('rxclock', @RegisterRxClock);
   RegisterUnit('rxspin', @RegisterRxSpin);
   RegisterUnit('RxTimeEdit', @RegisterRxTimeEdit);
diff --git a/components/rx/trunk/registerrxdb.pas b/components/rx/trunk/registerrxdb.pas
index 7f2c97117..6dd408282 100644
--- a/components/rx/trunk/registerrxdb.pas
+++ b/components/rx/trunk/registerrxdb.pas
@@ -41,8 +41,8 @@ uses
 procedure Register;
 implementation
 uses DB, DBPropEdits, rxdbgrid, RxDBSpinEdit, RxDBTimeEdit, RxDBCtrls, rxmemds,
-  ComponentEditors, seldsfrm, PropEdits, RxDBColorBox, dbdateedit, rxdbcomb,
-  rxlookup, dbcurredit, RxDBGridFooterTools
+  ComponentEditors, rxseldsfrm, PropEdits, RxDBColorBox, rxdbdateedit, rxdbcomb,
+  rxlookup, rxdbcurredit, RxDBGridFooterTools
   {$IF (FPC_FULLVERSION >= 30101)}
   , RxDBGridExportPdf
   {$ENDIF}
@@ -162,7 +162,7 @@ end;
 procedure Register;
 begin
   //RX DBAware
-  RegisterUnit('dbdateedit', @RegisterUnitDBDateEdit);
+  RegisterUnit('rxdbdateedit', @RegisterUnitDBDateEdit);
   RegisterUnit('rxlookup', @RegisterRXLookup);
   RegisterUnit('rxdbcomb', @RegisterRxDBComb);
 
diff --git a/components/rx/trunk/rx.res b/components/rx/trunk/rx.res
index 34952c533..545c2cc7a 100644
Binary files a/components/rx/trunk/rx.res and b/components/rx/trunk/rx.res differ
diff --git a/components/rx/trunk/boxprocs.pas b/components/rx/trunk/rxboxprocs.pas
similarity index 99%
rename from components/rx/trunk/boxprocs.pas
rename to components/rx/trunk/rxboxprocs.pas
index b9c545858..fdb7ecd56 100644
--- a/components/rx/trunk/boxprocs.pas
+++ b/components/rx/trunk/rxboxprocs.pas
@@ -29,7 +29,7 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit boxprocs;
+unit rxboxprocs;
 
 {$I rx.inc}
 
diff --git a/components/rx/trunk/rxceeditlookupfields.pas b/components/rx/trunk/rxceeditlookupfields.pas
index bc282e9a3..33f283bd8 100644
--- a/components/rx/trunk/rxceeditlookupfields.pas
+++ b/components/rx/trunk/rxceeditlookupfields.pas
@@ -61,7 +61,7 @@ procedure RegisterCEEditLookupFields;
 implementation
 uses
   //
-  db, duallist, Forms, rxstrutils, TypInfo, rxdconst,
+  db, rxduallist, Forms, rxstrutils, TypInfo, rxdconst,
   //unit for edits
   rxlookup;
 
diff --git a/components/rx/trunk/rxclock.pas b/components/rx/trunk/rxclock.pas
index 2df58885e..a938124fe 100644
--- a/components/rx/trunk/rxclock.pas
+++ b/components/rx/trunk/rxclock.pas
@@ -34,7 +34,7 @@ unit rxclock;
 interface
 
 {$I rx.inc}
-uses LCLType, LMessages, SysUtils, Classes, Graphics, Controls, Forms, {StdCtrls,}
+uses LCLType, LMessages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, Menus, messages;
 
 type
@@ -178,7 +178,7 @@ type
 
 implementation
 
-uses VCLUtils, RTLConsts{, LConsts}, LCLIntf;
+uses rxvclutils, RTLConsts, LCLIntf;
 
 const
   Registered: Boolean = False;
diff --git a/components/rx/trunk/rxctrls.pas b/components/rx/trunk/rxctrls.pas
index 9f3cdae6e..fc2e5fe54 100644
--- a/components/rx/trunk/rxctrls.pas
+++ b/components/rx/trunk/rxctrls.pas
@@ -821,7 +821,7 @@ type
 implementation
 
 
-uses SysUtils, Dialogs, VCLUtils, Math, RxAppUtils, ImgList,
+uses SysUtils, Dialogs, rxVCLUtils, Math, RxAppUtils, ImgList,
  ActnList, InterfaceBase;
 const
   Alignments: array [TAlignment] of Word = (DT_LEFT, DT_RIGHT, DT_CENTER);
diff --git a/components/rx/trunk/curredit.pas b/components/rx/trunk/rxcurredit.pas
similarity index 99%
rename from components/rx/trunk/curredit.pas
rename to components/rx/trunk/rxcurredit.pas
index ae7faef4b..29d959cd4 100644
--- a/components/rx/trunk/curredit.pas
+++ b/components/rx/trunk/rxcurredit.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit curredit;
+unit rxcurredit;
 
 {$I rx.inc}
 
@@ -198,7 +198,7 @@ type
   end;
 
 implementation
-uses strutils, Math, tooledit, rxconst;
+uses strutils, Math, rxtooledit, rxconst;
 
 function IsValidFloat(const Value: string; var RetValue: Extended): Boolean;
 var
diff --git a/components/rx/trunk/rxdbcomb.pas b/components/rx/trunk/rxdbcomb.pas
index cf90ed7c2..99fdc7a79 100644
--- a/components/rx/trunk/rxdbcomb.pas
+++ b/components/rx/trunk/rxdbcomb.pas
@@ -170,7 +170,7 @@ type
 
 implementation
 
-uses DBUtils, rxdconst;
+uses rxDBUtils, rxdconst;
 
 { TCustomDBComboBox }
 
diff --git a/components/rx/trunk/rxdbctrls.pas b/components/rx/trunk/rxdbctrls.pas
index 09ff4fe72..3139d426c 100644
--- a/components/rx/trunk/rxdbctrls.pas
+++ b/components/rx/trunk/rxdbctrls.pas
@@ -212,7 +212,7 @@ type
   end;
 
 implementation
-uses dbutils, LCLVersion, vclutils, StdCtrls;
+uses rxdbutils, LCLVersion, rxvclutils, StdCtrls;
 
 { TRxDBRadioGroup }
 
diff --git a/components/rx/trunk/dbcurredit.pas b/components/rx/trunk/rxdbcurredit.pas
similarity index 99%
rename from components/rx/trunk/dbcurredit.pas
rename to components/rx/trunk/rxdbcurredit.pas
index 85f10f57d..a0bcd4a17 100644
--- a/components/rx/trunk/dbcurredit.pas
+++ b/components/rx/trunk/rxdbcurredit.pas
@@ -31,7 +31,7 @@ original conception from rx library for Delphi (c)
   First version By Daniel Simões de Almeida
 }
 
-unit dbcurredit ;
+unit rxdbcurredit;
 
 {$I rx.inc}
 
@@ -39,7 +39,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, LMessages, LCLType, Controls, Graphics,
-  DB, DbCtrls, curredit ;
+  DB, DbCtrls, rxcurredit ;
 
 type
 
diff --git a/components/rx/trunk/dbdateedit.pas b/components/rx/trunk/rxdbdateedit.pas
similarity index 99%
rename from components/rx/trunk/dbdateedit.pas
rename to components/rx/trunk/rxdbdateedit.pas
index df1f4313c..bd3a99d21 100644
--- a/components/rx/trunk/dbdateedit.pas
+++ b/components/rx/trunk/rxdbdateedit.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit dbdateedit;
+unit rxdbdateedit;
 
 {$I rx.inc}
 
@@ -37,7 +37,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, LMessages, LCLType, Controls, Graphics,
-  DB, DbCtrls, EditBtn, tooledit;
+  DB, DbCtrls, EditBtn, rxtooledit;
 
 type
 
diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index a4b5e2558..14de0e48c 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -37,7 +37,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, LCLType, LCLIntf, Forms, Controls, Buttons,
-  Graphics, Dialogs, Grids, dbutils, DBGrids, DB, PropertyStorage, vclutils,
+  Graphics, Dialogs, Grids, rxdbutils, DBGrids, DB, PropertyStorage, rxvclutils,
   LMessages, types, StdCtrls, Menus, rxspin;
 
 const
@@ -951,7 +951,7 @@ procedure RegisterRxDBGridSortEngine(RxDBGridSortEngineClass: TRxDBGridSortEngin
 implementation
 
 uses Math, rxdconst, rxstrutils, strutils, rxdbgrid_findunit, rxdbgrid_columsunit,
-  rxlookup, tooledit, LCLProc, Clipbrd, rxfilterby, rxsortby, variants, LazUTF8;
+  rxlookup, rxtooledit, LCLProc, Clipbrd, rxfilterby, rxsortby, variants, LazUTF8;
 
 {$R rxdbgrid.res}
 
diff --git a/components/rx/trunk/rxdbgrid_findunit.pas b/components/rx/trunk/rxdbgrid_findunit.pas
index 436b06b95..7788c20be 100644
--- a/components/rx/trunk/rxdbgrid_findunit.pas
+++ b/components/rx/trunk/rxdbgrid_findunit.pas
@@ -69,7 +69,7 @@ type
 procedure ShowRxDBGridFindForm(Grid:TRxDBGrid);
 
 implementation
-uses dbutils, DBGrids, rxdconst, LCLStrConsts;
+uses rxdbutils, DBGrids, rxdconst, LCLStrConsts;
 
 {$R *.lfm}
 
diff --git a/components/rx/trunk/rxdbgridexportpdf.pas b/components/rx/trunk/rxdbgridexportpdf.pas
index 6d882ce68..579c5ff52 100644
--- a/components/rx/trunk/rxdbgridexportpdf.pas
+++ b/components/rx/trunk/rxdbgridexportpdf.pas
@@ -37,7 +37,7 @@ interface
 
 {$IF (FPC_FULLVERSION >= 30101)}
 uses
-  Classes, SysUtils, DB, rxdbgrid, vclutils, Graphics, fpPDF, contnrs,  fpparsettf,
+  Classes, SysUtils, DB, rxdbgrid, rxvclutils, Graphics, fpPDF, contnrs,  fpparsettf,
   fpTTF;
 
 type
diff --git a/components/rx/trunk/rxdbgridexportspreadsheet.pas b/components/rx/trunk/rxdbgridexportspreadsheet.pas
index 07e582508..4c0601fff 100644
--- a/components/rx/trunk/rxdbgridexportspreadsheet.pas
+++ b/components/rx/trunk/rxdbgridexportspreadsheet.pas
@@ -88,7 +88,7 @@ procedure Register;
 
 implementation
 uses fpsallformats, LCLType, Forms, math, LazUTF8, rxdconst, Controls, LCLIntf,
-  RxDBGridExportSpreadSheet_ParamsUnit, dbutils, fpsutils;
+  RxDBGridExportSpreadSheet_ParamsUnit, rxdbutils, fpsutils;
 
 {$R rxdbgridexportspreadsheet.res}
 
diff --git a/components/rx/trunk/rxdbgridfootertools_setup.pas b/components/rx/trunk/rxdbgridfootertools_setup.pas
index bbbe0e7b6..a42e7dac2 100644
--- a/components/rx/trunk/rxdbgridfootertools_setup.pas
+++ b/components/rx/trunk/rxdbgridfootertools_setup.pas
@@ -66,7 +66,7 @@ const
   rxFooterFunctionNames : array [TFooterValueType] of string =
     (sfvtNon, sfvtSum, sfvtAvg, sfvtCount, sfvtFieldValue, sfvtStaticText, sfvtMax, sfvtMin, sfvtRecNo);
 implementation
-uses dbutils;
+uses rxdbutils;
 
 {$R *.lfm}
 
diff --git a/components/rx/trunk/rxdbgridprintgrid.pas b/components/rx/trunk/rxdbgridprintgrid.pas
index a144d9339..ba50a2704 100644
--- a/components/rx/trunk/rxdbgridprintgrid.pas
+++ b/components/rx/trunk/rxdbgridprintgrid.pas
@@ -36,7 +36,7 @@ interface
 
 uses
   Classes, SysUtils, DB, rxdbgrid, LR_Class, LR_DSet, LR_DBSet, contnrs,
-  Graphics, Printers, vclutils;
+  Graphics, Printers, rxvclutils;
 
 type
   TRxDBGridPrintOption =
diff --git a/components/rx/trunk/rxdbspinedit.pas b/components/rx/trunk/rxdbspinedit.pas
index e4c045094..b4642ceaa 100644
--- a/components/rx/trunk/rxdbspinedit.pas
+++ b/components/rx/trunk/rxdbspinedit.pas
@@ -129,7 +129,7 @@ type
   end;
 
 implementation
-uses dbutils;
+uses rxdbutils;
 
 type
   TFieldDataLinkHack = class(TFieldDataLink)
diff --git a/components/rx/trunk/rxdbtimeedit.pas b/components/rx/trunk/rxdbtimeedit.pas
index 452ec7867..f0c994abb 100644
--- a/components/rx/trunk/rxdbtimeedit.pas
+++ b/components/rx/trunk/rxdbtimeedit.pas
@@ -139,7 +139,7 @@ type
 
 
 implementation
-uses dbutils, LCLVersion;
+uses rxdbutils, LCLVersion;
 
 type
   TFieldDataLinkHack = class(TFieldDataLink)
diff --git a/components/rx/trunk/dbutils.pas b/components/rx/trunk/rxdbutils.pas
similarity index 99%
rename from components/rx/trunk/dbutils.pas
rename to components/rx/trunk/rxdbutils.pas
index d5b59c58f..2873e1c92 100644
--- a/components/rx/trunk/dbutils.pas
+++ b/components/rx/trunk/rxdbutils.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit dbutils;
+unit rxdbutils;
 
 {$I rx.inc}
 
@@ -164,7 +164,7 @@ procedure _DBError(const Msg: string);
 
 implementation
 
-uses Forms, Controls, Dialogs, RXDConst, VCLUtils, FileUtil,
+uses Forms, Controls, Dialogs, RXDConst, rxvclutils, FileUtil,
   AppUtils, RxAppUtils, RxStrUtils, Math, rxdateutil, LazUTF8;
 
 { Utility routines }
diff --git a/components/rx/trunk/rxdice.pas b/components/rx/trunk/rxdice.pas
index 39dd0a98e..d92815b68 100644
--- a/components/rx/trunk/rxdice.pas
+++ b/components/rx/trunk/rxdice.pas
@@ -35,7 +35,7 @@ interface
 {$I rx.inc}
 
 uses SysUtils, LCLType, LCLProc, LCLIntf, LMessages, Classes, Graphics,
-  Controls, Forms, StdCtrls, ExtCtrls, Menus, VCLUtils;
+  Controls, Forms, StdCtrls, ExtCtrls, Menus, rxVCLUtils;
 
 type
   TRxDiceValue = 1..6;
diff --git a/components/rx/trunk/duallist.pas b/components/rx/trunk/rxduallist.pas
similarity index 98%
rename from components/rx/trunk/duallist.pas
rename to components/rx/trunk/rxduallist.pas
index 974212984..074f7526e 100644
--- a/components/rx/trunk/duallist.pas
+++ b/components/rx/trunk/rxduallist.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit duallist;
+unit rxduallist;
 
 interface
 
@@ -88,7 +88,7 @@ type
 
 implementation
 
-uses SysUtils, Forms, FDualLst, VCLUtils, LCLStrConsts, rxconst;
+uses SysUtils, Forms, rxfduallst, LCLStrConsts, rxconst;
 
 { TDualListDialog }
 
diff --git a/components/rx/trunk/fduallst.lfm b/components/rx/trunk/rxfduallst.lfm
similarity index 100%
rename from components/rx/trunk/fduallst.lfm
rename to components/rx/trunk/rxfduallst.lfm
diff --git a/components/rx/trunk/fduallst.pas b/components/rx/trunk/rxfduallst.pas
similarity index 99%
rename from components/rx/trunk/fduallst.pas
rename to components/rx/trunk/rxfduallst.pas
index 7b6a13a5c..5838623ae 100644
--- a/components/rx/trunk/fduallst.pas
+++ b/components/rx/trunk/rxfduallst.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit fduallst;
+unit rxfduallst;
 
 {$I RX.INC}
 
@@ -81,7 +81,7 @@ end;
 
 implementation
 
-uses vclutils, boxprocs;
+uses rxvclutils, rxboxprocs;
 
 {$R *.lfm}
 
diff --git a/components/rx/trunk/folderlister.pas b/components/rx/trunk/rxfolderlister.pas
similarity index 99%
rename from components/rx/trunk/folderlister.pas
rename to components/rx/trunk/rxfolderlister.pas
index 3086986ae..f74c00b6d 100644
--- a/components/rx/trunk/folderlister.pas
+++ b/components/rx/trunk/rxfolderlister.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit folderlister;
+unit rxfolderlister;
 
 {$I rx.inc}
 
diff --git a/components/rx/trunk/rxlogin.pas b/components/rx/trunk/rxlogin.pas
index 520902686..30fc4508f 100644
--- a/components/rx/trunk/rxlogin.pas
+++ b/components/rx/trunk/rxlogin.pas
@@ -206,7 +206,7 @@ function CreateLoginDialog(UnlockMode, ASelectDatabase: Boolean;
 implementation
 
 uses
-  Registry, IniFiles, RxAppUtils, RxDConst, VclUtils, RxConst;
+  Registry, IniFiles, RxAppUtils, RxDConst, rxVclUtils, RxConst;
 
 const
   keyLoginSection                = 'Login Dialog';
diff --git a/components/rx/trunk/rxlookup.pas b/components/rx/trunk/rxlookup.pas
index 507fd8079..530cda7ae 100644
--- a/components/rx/trunk/rxlookup.pas
+++ b/components/rx/trunk/rxlookup.pas
@@ -38,7 +38,7 @@ interface
 uses
   LCLType, LCLProc, LCLIntf, Classes, SysUtils, LResources, Forms, types,
   Controls, Graphics, Dialogs, DB, EditBtn, DBGrids, Buttons,
-  LMessages, DbCtrls, GraphType, dbutils, RxDbGrid, rxpopupunit, Themes;
+  LMessages, DbCtrls, GraphType, rxdbutils, RxDbGrid, rxpopupunit, Themes;
 
 const
   TextMargin = 5;
@@ -388,7 +388,7 @@ type
   end;
   
 implementation
-uses VCLUtils, Math, rxdconst;
+uses rxVCLUtils, Math, rxdconst;
 
 type
   TDbGridAccess = class(TDbGrid)
diff --git a/components/rx/trunk/rxmdi.pas b/components/rx/trunk/rxmdi.pas
index 873813937..fc1cfe16f 100644
--- a/components/rx/trunk/rxmdi.pas
+++ b/components/rx/trunk/rxmdi.pas
@@ -156,8 +156,7 @@ type
   end;
 
 implementation
-uses LResources, vclutils, rxconst;
-//  LCLProc;
+uses LResources, rxvclutils, rxconst;
 
 
 { TRxMDICloseButton }
diff --git a/components/rx/trunk/rxmemds.pas b/components/rx/trunk/rxmemds.pas
index dc0206f38..f76676a88 100644
--- a/components/rx/trunk/rxmemds.pas
+++ b/components/rx/trunk/rxmemds.pas
@@ -261,7 +261,7 @@ type
 implementation
 
 
-uses CustApp, rxdconst, LazUTF8, dbutils, dbconst, Variants, math, LResources;
+uses CustApp, rxdconst, LazUTF8, rxdbutils, dbconst, Variants, math, LResources;
 
 const
   ftBlobTypes = [ftBlob, ftMemo, ftGraphic, ftFmtMemo, ftParadoxOle,
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index 9f98bf348..18928d73b 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -26,46 +26,46 @@ translate to Lazarus by alexs in 2005 - 2016
 "/>
     <License Value="LGPL"/>
     <Version Major="2" Minor="9" Release="4" Build="200"/>
-    <Files Count="70">
+    <Files Count="69">
       <Item1>
         <Filename Value="rxautopanel.pas"/>
-        <UnitName Value="rxautopanel"/>
+        <UnitName Value="RxAutoPanel"/>
       </Item1>
       <Item2>
-        <Filename Value="boxprocs.pas"/>
-        <UnitName Value="boxprocs"/>
+        <Filename Value="rxboxprocs.pas"/>
+        <UnitName Value="rxboxprocs"/>
       </Item2>
       <Item3>
-        <Filename Value="curredit.pas"/>
-        <UnitName Value="curredit"/>
+        <Filename Value="rxcurredit.pas"/>
+        <UnitName Value="rxcurredit"/>
       </Item3>
       <Item4>
-        <Filename Value="dbcurredit.pas"/>
-        <UnitName Value="dbcurredit"/>
+        <Filename Value="rxdbcurredit.pas"/>
+        <UnitName Value="rxdbcurredit"/>
       </Item4>
       <Item5>
-        <Filename Value="dbdateedit.pas"/>
-        <UnitName Value="dbdateedit"/>
+        <Filename Value="rxdbdateedit.pas"/>
+        <UnitName Value="rxdbdateedit"/>
       </Item5>
       <Item6>
-        <Filename Value="dbutils.pas"/>
-        <UnitName Value="dbutils"/>
+        <Filename Value="rxdbutils.pas"/>
+        <UnitName Value="rxdbutils"/>
       </Item6>
       <Item7>
-        <Filename Value="duallist.pas"/>
-        <UnitName Value="duallist"/>
+        <Filename Value="rxduallist.pas"/>
+        <UnitName Value="rxduallist"/>
       </Item7>
       <Item8>
-        <Filename Value="fduallst.pas"/>
-        <UnitName Value="fduallst"/>
+        <Filename Value="rxfduallst.pas"/>
+        <UnitName Value="rxfduallst"/>
       </Item8>
       <Item9>
-        <Filename Value="folderlister.pas"/>
-        <UnitName Value="folderlister"/>
+        <Filename Value="rxfolderlister.pas"/>
+        <UnitName Value="rxfolderlister"/>
       </Item9>
       <Item10>
-        <Filename Value="pagemngr.pas"/>
-        <UnitName Value="pagemngr"/>
+        <Filename Value="rxpagemngr.pas"/>
+        <UnitName Value="rxpagemngr"/>
       </Item10>
       <Item11>
         <Filename Value="rxpickdate.pas"/>
@@ -219,97 +219,93 @@ translate to Lazarus by alexs in 2005 - 2016
         <UnitName Value="RxViewsPanel"/>
       </Item47>
       <Item48>
-        <Filename Value="rxxpman.pas"/>
-        <UnitName Value="rxxpman"/>
+        <Filename Value="rxseldsfrm.pas"/>
+        <UnitName Value="rxseldsfrm"/>
       </Item48>
       <Item49>
-        <Filename Value="seldsfrm.pas"/>
-        <UnitName Value="seldsfrm"/>
+        <Filename Value="rxtooledit.pas"/>
+        <UnitName Value="rxtooledit"/>
       </Item49>
       <Item50>
-        <Filename Value="tooledit.pas"/>
-        <UnitName Value="tooledit"/>
+        <Filename Value="rxvclutils.pas"/>
+        <UnitName Value="rxvclutils"/>
       </Item50>
       <Item51>
-        <Filename Value="vclutils.pas"/>
-        <UnitName Value="vclutils"/>
-      </Item51>
-      <Item52>
         <Filename Value="rxcloseformvalidator.pas"/>
         <UnitName Value="RxCloseFormValidator"/>
-      </Item52>
-      <Item53>
+      </Item51>
+      <Item52>
         <Filename Value="rxhistorynavigator.pas"/>
         <UnitName Value="RxHistoryNavigator"/>
-      </Item53>
-      <Item54>
+      </Item52>
+      <Item53>
         <Filename Value="ex_rx_bin_datapacket.pas"/>
         <UnitName Value="ex_rx_bin_datapacket"/>
-      </Item54>
-      <Item55>
+      </Item53>
+      <Item54>
         <Filename Value="ex_rx_datapacket.pas"/>
         <UnitName Value="ex_rx_datapacket"/>
-      </Item55>
-      <Item56>
+      </Item54>
+      <Item55>
         <Filename Value="ex_rx_xml_datapacket.pas"/>
         <UnitName Value="ex_rx_xml_datapacket"/>
-      </Item56>
-      <Item57>
+      </Item55>
+      <Item56>
         <Filename Value="rxsortby.lfm"/>
         <Type Value="LFM"/>
-      </Item57>
-      <Item58>
+      </Item56>
+      <Item57>
         <Filename Value="rxsortby.pas"/>
         <UnitName Value="rxsortby"/>
-      </Item58>
-      <Item59>
+      </Item57>
+      <Item58>
         <Filename Value="rxmdi.pas"/>
         <UnitName Value="RxMDI"/>
-      </Item59>
-      <Item60>
+      </Item58>
+      <Item59>
         <Filename Value="rxinipropstorage.pas"/>
         <UnitName Value="RxIniPropStorage"/>
-      </Item60>
-      <Item61>
+      </Item59>
+      <Item60>
         <Filename Value="rx_lcl.res"/>
         <Type Value="Binary"/>
-      </Item61>
-      <Item62>
+      </Item60>
+      <Item61>
         <Filename Value="rxdaterangeeditunit.pas"/>
         <UnitName Value="rxDateRangeEditUnit"/>
-      </Item62>
-      <Item63>
+      </Item61>
+      <Item62>
         <Filename Value="rxdbgridfootertools.pas"/>
         <UnitName Value="RxDBGridFooterTools"/>
-      </Item63>
-      <Item64>
+      </Item62>
+      <Item63>
         <Filename Value="rxdbgridfootertools_setup.lfm"/>
         <Type Value="LFM"/>
-      </Item64>
-      <Item65>
+      </Item63>
+      <Item64>
         <Filename Value="rxdbgridfootertools_setup.pas"/>
         <UnitName Value="rxdbgridfootertools_setup"/>
-      </Item65>
-      <Item66>
+      </Item64>
+      <Item65>
         <Filename Value="rxshortcutunit.lfm"/>
         <Type Value="LFM"/>
-      </Item66>
-      <Item67>
+      </Item65>
+      <Item66>
         <Filename Value="rxshortcutunit.pas"/>
         <UnitName Value="rxShortCutUnit"/>
-      </Item67>
-      <Item68>
+      </Item66>
+      <Item67>
         <Filename Value="rxdbgridexportpdf.pas"/>
         <UnitName Value="RxDBGridExportPdf"/>
-      </Item68>
-      <Item69>
+      </Item67>
+      <Item68>
         <Filename Value="rxdbgridexportpdfsetupunit.lfm"/>
         <Type Value="LFM"/>
-      </Item69>
-      <Item70>
+      </Item68>
+      <Item69>
         <Filename Value="rxdbgridexportpdfsetupunit.pas"/>
         <UnitName Value="RxDBGridExportPdfSetupUnit"/>
-      </Item70>
+      </Item69>
     </Files>
     <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
     <i18n>
diff --git a/components/rx/trunk/rxnew.pas b/components/rx/trunk/rxnew.pas
index b68b95f46..077707b2b 100644
--- a/components/rx/trunk/rxnew.pas
+++ b/components/rx/trunk/rxnew.pas
@@ -8,15 +8,15 @@ unit rxnew;
 interface
 
 uses
-  RxAutoPanel, boxprocs, curredit, dbcurredit, dbdateedit, dbutils, duallist, 
-  fduallst, folderlister, pagemngr, rxpickdate, registerrx, RegisterRxDB, 
-  RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, rxapputils, 
-  rxclock, rxconst, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid, 
-  rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit, 
-  rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, rxmemds, 
-  rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, rxtbrsetup, 
-  RxTimeEdit, rxtoolbar, RxVersInfo, RxViewsPanel, rxxpman, seldsfrm, 
-  tooledit, vclutils, RxCloseFormValidator, RxHistoryNavigator, 
+  RxAutoPanel, rxboxprocs, rxcurredit, rxdbcurredit, rxdbdateedit, rxdbutils, 
+  rxduallist, rxfduallst, rxfolderlister, rxpagemngr, rxpickdate, registerrx, 
+  RegisterRxDB, RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, 
+  rxapputils, rxclock, rxconst, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, 
+  rxdbgrid, rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, 
+  RxDBTimeEdit, rxdconst, rxdice, rxfilterby, rxiconv, rxlogin, rxlookup, 
+  rxmemds, rxpopupunit, rxsortmemds, rxspin, rxswitch, RxSystemServices, 
+  rxtbrsetup, RxTimeEdit, rxtoolbar, RxVersInfo, RxViewsPanel, rxseldsfrm, 
+  rxtooledit, rxvclutils, RxCloseFormValidator, RxHistoryNavigator, 
   ex_rx_bin_datapacket, ex_rx_datapacket, ex_rx_xml_datapacket, rxsortby, 
   RxMDI, RxIniPropStorage, rxDateRangeEditUnit, RxDBGridFooterTools, 
   rxdbgridfootertools_setup, rxShortCutUnit, RxDBGridExportPdf, 
diff --git a/components/rx/trunk/pagemngr.pas b/components/rx/trunk/rxpagemngr.pas
similarity index 99%
rename from components/rx/trunk/pagemngr.pas
rename to components/rx/trunk/rxpagemngr.pas
index 525ca4631..2f0f8267b 100644
--- a/components/rx/trunk/pagemngr.pas
+++ b/components/rx/trunk/rxpagemngr.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit pagemngr;
+unit rxpagemngr;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/rx/trunk/rxpickdate.pas b/components/rx/trunk/rxpickdate.pas
index 4b4409dc7..390b923f5 100644
--- a/components/rx/trunk/rxpickdate.pas
+++ b/components/rx/trunk/rxpickdate.pas
@@ -264,7 +264,7 @@ const
 
 implementation
 
-uses Messages, RXCtrls, rxconst, ToolEdit, vclutils, math, LCLStrConsts, LResources;
+uses Messages, RXCtrls, rxconst, rxtooledit, rxvclutils, math, LCLStrConsts, LResources;
 
 {$R pickdate.res}
 
diff --git a/components/rx/trunk/rxpopupunit.pas b/components/rx/trunk/rxpopupunit.pas
index ee21f7a21..0aaf81532 100644
--- a/components/rx/trunk/rxpopupunit.pas
+++ b/components/rx/trunk/rxpopupunit.pas
@@ -37,7 +37,7 @@ interface
 
 uses
   Classes, SysUtils, DB, Forms, DBGrids, rxdbgrid, LCLType, Controls, ComCtrls,
-  Buttons, Grids, Graphics, vclutils;
+  Buttons, Grids, Graphics, rxvclutils;
 
 type
   TPopUpCloseEvent = procedure(AResult:boolean) of object;
@@ -247,7 +247,7 @@ function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet;
 procedure FillPopupWidth(APopUpFormOptions:TPopUpFormOptions; ARxPopUpForm:TPopUpForm);
 
 implementation
-uses dbutils, math, LCLProc, LazUTF8;
+uses rxdbutils, math, LCLProc, LazUTF8;
 
 function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet;
   AOnPopUpCloseEvent:TPopUpCloseEvent; APopUpFormOptions:TPopUpFormOptions;
diff --git a/components/rx/trunk/seldsfrm.lfm b/components/rx/trunk/rxseldsfrm.lfm
similarity index 100%
rename from components/rx/trunk/seldsfrm.lfm
rename to components/rx/trunk/rxseldsfrm.lfm
diff --git a/components/rx/trunk/seldsfrm.pas b/components/rx/trunk/rxseldsfrm.pas
similarity index 99%
rename from components/rx/trunk/seldsfrm.pas
rename to components/rx/trunk/rxseldsfrm.pas
index 57ce42833..58176c6f7 100644
--- a/components/rx/trunk/seldsfrm.pas
+++ b/components/rx/trunk/rxseldsfrm.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit seldsfrm;
+unit rxseldsfrm;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/rx/trunk/rxspin.pas b/components/rx/trunk/rxspin.pas
index c51679637..8fb8023db 100644
--- a/components/rx/trunk/rxspin.pas
+++ b/components/rx/trunk/rxspin.pas
@@ -242,7 +242,7 @@ type
 implementation
 
 uses
-  VCLUtils, LResources;
+  rxvclutils, LResources;
 
 const
   sSpinUpBtn = 'RXSPINUP';
diff --git a/components/rx/trunk/rxswitch.pas b/components/rx/trunk/rxswitch.pas
index 5ea29d82b..1fc4e3629 100644
--- a/components/rx/trunk/rxswitch.pas
+++ b/components/rx/trunk/rxswitch.pas
@@ -36,7 +36,7 @@ unit rxswitch;
 interface
 
 uses SysUtils, LCLType, LCLProc, LCLIntf, LMessages, Classes, Graphics,
-  Controls, Forms, {StdCtrls,} ExtCtrls, Menus;
+  Controls, Forms, ExtCtrls, Menus;
 
 type
 
@@ -154,7 +154,7 @@ type
 
 implementation
 
-uses VCLUtils;
+uses rxvclutils;
 
 const
   BorderStyles: array[TBorderStyle] of Longint = (0, WS_BORDER);
diff --git a/components/rx/trunk/rxtbrsetup.pas b/components/rx/trunk/rxtbrsetup.pas
index db744e590..d8d5638e3 100644
--- a/components/rx/trunk/rxtbrsetup.pas
+++ b/components/rx/trunk/rxtbrsetup.pas
@@ -90,7 +90,7 @@ var
   ToolPanelSetupForm: TToolPanelSetupForm;
 
 implementation
-uses vclutils, ActnList, boxprocs, rxconst, LCLProc, rxShortCutUnit;
+uses rxvclutils, ActnList, rxboxprocs, rxconst, LCLProc, rxShortCutUnit;
 
 {$R *.lfm}
 
diff --git a/components/rx/trunk/rxtoolbar.pas b/components/rx/trunk/rxtoolbar.pas
index 906a75fca..5bf8153c4 100644
--- a/components/rx/trunk/rxtoolbar.pas
+++ b/components/rx/trunk/rxtoolbar.pas
@@ -278,7 +278,7 @@ type
   end;
 
 implementation
-uses Math, RxTBRSetup, LCLProc, vclutils, Dialogs, typinfo, rxdconst, GraphType,
+uses Math, RxTBRSetup, LCLProc, rxvclutils, Dialogs, typinfo, rxdconst, GraphType,
   LResources;
 
 const
diff --git a/components/rx/trunk/tooledit.lrs b/components/rx/trunk/rxtooledit.lrs
similarity index 100%
rename from components/rx/trunk/tooledit.lrs
rename to components/rx/trunk/rxtooledit.lrs
diff --git a/components/rx/trunk/tooledit.pas b/components/rx/trunk/rxtooledit.pas
similarity index 99%
rename from components/rx/trunk/tooledit.pas
rename to components/rx/trunk/rxtooledit.pas
index 9b93320bb..2c0f08361 100644
--- a/components/rx/trunk/tooledit.pas
+++ b/components/rx/trunk/rxtooledit.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit tooledit;
+unit rxtooledit;
 
 {$I rx.inc}
 
@@ -969,7 +969,7 @@ end;
 
 {$IFDEF RX_USE_LAZARUS_RESOURCE}
 initialization
-  {$I tooledit.lrs}
+  {$I rxtooledit.lrs}
 {$ENDIF}
 
 end.
diff --git a/components/rx/trunk/vclutils.pas b/components/rx/trunk/rxvclutils.pas
similarity index 99%
rename from components/rx/trunk/vclutils.pas
rename to components/rx/trunk/rxvclutils.pas
index 623341ce4..798fea717 100644
--- a/components/rx/trunk/vclutils.pas
+++ b/components/rx/trunk/rxvclutils.pas
@@ -29,7 +29,7 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit vclutils;
+unit rxvclutils;
 
 {$I rx.inc}
 
diff --git a/components/rx/trunk/rxxpman.pas b/components/rx/trunk/rxxpman.pas
deleted file mode 100644
index 8c87233f2..000000000
--- a/components/rx/trunk/rxxpman.pas
+++ /dev/null
@@ -1,59 +0,0 @@
-{ rxxpman unit
-
-Copyright (C) 2005-2016 Lagunov Aleksey alexs75@yandex.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 rxxpman;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs;
-
-type
-  TRXXPManifest = class(TComponent)
-  private
-    { Private declarations }
-  protected
-    { Protected declarations }
-  public
-    { Public declarations }
-  published
-    { Published declarations }
-  end;
-
-implementation
-
-{$IFDEF WIN32}
-{.$R WindowsXP.RES}
-{$ENDIF}
-
-end.
diff --git a/components/rx/trunk/seldsfrm.lrt b/components/rx/trunk/seldsfrm.lrt
deleted file mode 100644
index 0fbff53db..000000000
--- a/components/rx/trunk/seldsfrm.lrt
+++ /dev/null
@@ -1,3 +0,0 @@
-TSELECTDATASETFORM.CAPTION=Select dataset to copy to
-TSELECTDATASETFORM.LABEL1.CAPTION=Sourse dataset
-TSELECTDATASETFORM.CHECKBOX1.CAPTION=Copy only metadata