diff --git a/components/rx/trunk/dcl_rx_ctrl.lpk b/components/rx/trunk/dcl_rx_ctrl.lpk
index c56eda228..431a4ee44 100644
--- a/components/rx/trunk/dcl_rx_ctrl.lpk
+++ b/components/rx/trunk/dcl_rx_ctrl.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="dcl_rx_ctrl"/>
-        <UnitOutputDirectory Value="lib/dcl_rx_ctrl/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/dcl_rx_ctrl/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
diff --git a/components/rx/trunk/dcl_rxtools.lpk b/components/rx/trunk/dcl_rxtools.lpk
index a38c73836..cb7d1f657 100644
--- a/components/rx/trunk/dcl_rxtools.lpk
+++ b/components/rx/trunk/dcl_rxtools.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="dcl_rxtools"/>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/dcl_rxtools/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <License Value="LGPL 2"/>
diff --git a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lps b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lps
index af904c6ef..01883c88f 100644
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lps
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/project1.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <Version Value="12"/>
     <BuildModes Active="Default"/>
-    <Units Count="22">
+    <Units Count="24">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -11,7 +11,7 @@
         <WindowIndex Value="-1"/>
         <TopLine Value="-1"/>
         <CursorPos X="-1" Y="-1"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="36"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -20,10 +20,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="50"/>
-        <CursorPos X="9" Y="66"/>
-        <UsageCount Value="33"/>
+        <TopLine Value="47"/>
+        <CursorPos X="34" Y="58"/>
+        <UsageCount Value="36"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -76,10 +75,12 @@
       </Unit6>
       <Unit7>
         <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1799"/>
-        <CursorPos X="14" Y="1726"/>
-        <UsageCount Value="11"/>
+        <UnitName Value="DB"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="2279"/>
+        <CursorPos Y="2294"/>
+        <UsageCount Value="13"/>
+        <Loaded Value="True"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../rxdb/rxmemds.pas"/>
@@ -171,10 +172,17 @@
       </Unit19>
       <Unit20>
         <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <EditorIndex Value="1"/>
-        <TopLine Value="6203"/>
-        <CursorPos X="38" Y="6234"/>
-        <UsageCount Value="10"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="6182"/>
+        <CursorPos X="29" Y="6208"/>
+        <UsageCount Value="12"/>
+        <Bookmarks Count="4">
+          <Item0 X="13" Y="4243" ID="1"/>
+          <Item1 X="34" Y="903" ID="2"/>
+          <Item2 X="34" Y="6490" ID="3"/>
+          <Item3 X="10" Y="6204" ID="5"/>
+        </Bookmarks>
         <Loaded Value="True"/>
       </Unit20>
       <Unit21>
@@ -182,134 +190,152 @@
         <ComponentName Value="rxFilterByForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="5"/>
         <TopLine Value="341"/>
         <CursorPos X="98" Y="350"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="12"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit21>
+      <Unit22>
+        <Filename Value="../../../../../lcl/dbgrids.pas"/>
+        <UnitName Value="DBGrids"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="3014"/>
+        <CursorPos X="40" Y="3017"/>
+        <UsageCount Value="12"/>
+        <Loaded Value="True"/>
+      </Unit22>
+      <Unit23>
+        <Filename Value="../../../../../lcl/grids.pas"/>
+        <UnitName Value="Grids"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="3312"/>
+        <CursorPos X="3" Y="3316"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit23>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="279" Column="20" TopLine="279"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="3501" Column="30" TopLine="3477"/>
       </Position1>
       <Position2>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="105" Column="15" TopLine="87"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="3553" Column="36" TopLine="3528"/>
       </Position2>
       <Position3>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="186" Column="3" TopLine="181"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="3691" Column="22" TopLine="3666"/>
       </Position3>
       <Position4>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="105" Column="5" TopLine="87"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="3695" Column="28" TopLine="3670"/>
       </Position4>
       <Position5>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="197" Column="17" TopLine="178"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4246" Column="30" TopLine="4222"/>
       </Position5>
       <Position6>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="198" TopLine="177"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4298" Column="20" TopLine="4273"/>
       </Position6>
       <Position7>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="384" Column="27" TopLine="363"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4404" Column="31" TopLine="4380"/>
       </Position7>
       <Position8>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="107" Column="14" TopLine="89"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6054" Column="13" TopLine="6030"/>
       </Position8>
       <Position9>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="235" Column="30" TopLine="217"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6367" Column="30" TopLine="6343"/>
       </Position9>
       <Position10>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="109" Column="15" TopLine="87"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6536" Column="34" TopLine="6512"/>
       </Position10>
       <Position11>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="105" Column="15" TopLine="87"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6924" Column="32" TopLine="6899"/>
       </Position11>
       <Position12>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="197" Column="33" TopLine="181"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6956" Column="32" TopLine="6931"/>
       </Position12>
       <Position13>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="109" Column="15" TopLine="87"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6988" Column="32" TopLine="6963"/>
       </Position13>
       <Position14>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="351" Column="11" TopLine="332"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4228" TopLine="4220"/>
       </Position14>
       <Position15>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="354" Column="70" TopLine="337"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4275" TopLine="4254"/>
       </Position15>
       <Position16>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="353" TopLine="337"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4234" Column="12" TopLine="4221"/>
       </Position16>
       <Position17>
-        <Filename Value="../../../rxdb/rxfilterby.pas"/>
-        <Caret Line="354" TopLine="337"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4230" TopLine="4222"/>
       </Position17>
       <Position18>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="27" Column="6"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4240" Column="18" TopLine="4222"/>
       </Position18>
       <Position19>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="28" Column="6"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="886" Column="15" TopLine="872"/>
       </Position19>
       <Position20>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="29" Column="6"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4248" Column="3" TopLine="4240"/>
       </Position20>
       <Position21>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="31" Column="6"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="952" Column="15" TopLine="924"/>
       </Position21>
       <Position22>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="49" Column="29" TopLine="39"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6308" Column="3" TopLine="6302"/>
       </Position22>
       <Position23>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="50" Column="29" TopLine="40"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="788" Column="18" TopLine="783"/>
       </Position23>
       <Position24>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="52" Column="29" TopLine="42"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="3840" Column="62" TopLine="3815"/>
       </Position24>
       <Position25>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="64" Column="3" TopLine="43"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="3858" Column="23" TopLine="3834"/>
       </Position25>
       <Position26>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="69" Column="52" TopLine="43"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4789" Column="25" TopLine="4764"/>
       </Position26>
       <Position27>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="71" Column="52" TopLine="45"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="981" Column="15" TopLine="967"/>
       </Position27>
       <Position28>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="72" Column="52" TopLine="46"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6201" Column="10" TopLine="6182"/>
       </Position28>
       <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="82" Column="6" TopLine="56"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4243" Column="54" TopLine="4228"/>
       </Position29>
       <Position30>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="34" Column="15" TopLine="21"/>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="6220" Column="80" TopLine="6191"/>
       </Position30>
     </JumpHistory>
     <RunParams>
@@ -317,4 +343,15 @@
       <Modes Count="0" ActiveMode="default"/>
     </RunParams>
   </ProjectSession>
+  <Debugging>
+    <BreakPoints Count="1">
+      <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsLocal"/>
+        <WatchKind Value="wpkWrite"/>
+        <Source Value="../../../rxdb/rxdbgrid.pas"/>
+        <Line Value="6318"/>
+      </Item1>
+    </BreakPoints>
+  </Debugging>
 </CONFIG>
diff --git a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.lfm b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.lfm
index 320494792..6450809fd 100644
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.lfm
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.lfm
@@ -2,17 +2,17 @@ object Form1: TForm1
   Left = 612
   Height = 444
   Top = 268
-  Width = 702
+  Width = 813
   Caption = 'Form1'
   ClientHeight = 444
-  ClientWidth = 702
+  ClientWidth = 813
   OnCreate = FormCreate
   LCLVersion = '2.1.0.0'
   object RxDBGrid1: TRxDBGrid
     Left = 0
     Height = 389
     Top = 0
-    Width = 702
+    Width = 813
     ColumnDefValues.BlobText = '(blob)'
     TitleButtons = True
     AutoSort = True
@@ -94,6 +94,21 @@ object Form1: TForm1
         Filter.ItemIndex = -1
         Filter.Style = rxfstDialog
         Footers = <>
+      end    
+      item
+        Title.Alignment = taCenter
+        Title.Orientation = toHorizontal
+        Title.Caption = 'MEMO'
+        Width = 100
+        FieldName = 'MEMO'
+        EditButtons = <>
+        Filter.DropDownRows = 0
+        Filter.EmptyValue = '(Пусто)'
+        Filter.NotEmptyValue = '(Не пусто)'
+        Filter.AllValue = '(Все значения)'
+        Filter.EmptyFont.Style = [fsItalic]
+        Filter.ItemIndex = -1
+        Footers = <>
       end>
     KeyStrokes = <    
       item
@@ -162,17 +177,17 @@ object Form1: TForm1
     SelectedColor = clHighlight
     GridLineStyle = psSolid
     DataSource = dsData
-    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgHeaderPushedLook]
+    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgHeaderPushedLook, dgDisplayMemoText]
     TabOrder = 0
   end
   object Panel1: TPanel
     Left = 0
     Height = 50
     Top = 394
-    Width = 702
+    Width = 813
     Align = alBottom
     ClientHeight = 50
-    ClientWidth = 702
+    ClientWidth = 813
     TabOrder = 1
     object Button1: TButton
       Left = 8
@@ -228,13 +243,27 @@ object Form1: TForm1
       Caption = 'Label3'
       ParentColor = False
     end
+    object CheckBox1: TCheckBox
+      AnchorSideTop.Control = Panel1
+      AnchorSideRight.Control = Panel1
+      AnchorSideRight.Side = asrBottom
+      Left = 654
+      Height = 23
+      Top = 7
+      Width = 152
+      Anchors = [akTop, akRight]
+      BorderSpacing.Around = 6
+      Caption = 'Display memo values'
+      OnChange = CheckBox1Change
+      TabOrder = 3
+    end
   end
   object Splitter1: TSplitter
     Cursor = crVSplit
     Left = 0
     Height = 5
     Top = 389
-    Width = 702
+    Width = 813
     Align = alBottom
     ResizeAnchor = akBottom
   end
@@ -256,6 +285,10 @@ object Form1: TForm1
         Name = 'NAME'
         DataType = ftString
         Size = 200
+      end    
+      item
+        Name = 'MEMO'
+        DataType = ftMemo
       end>
     AfterInsert = rxDataAfterInsert
     PacketRecords = 0
@@ -298,6 +331,17 @@ object Form1: TForm1
       ReadOnly = False
       Required = False
     end
+    object rxDataMEMO: TMemoField
+      FieldKind = fkData
+      FieldName = 'MEMO'
+      Index = 4
+      LookupCache = False
+      ProviderFlags = [pfInUpdate, pfInWhere]
+      ReadOnly = False
+      Required = False
+      BlobType = ftMemo
+      Transliterate = False
+    end
   end
   object dsData: TDataSource
     DataSet = rxData
diff --git a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.pas b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.pas
index b348a33fb..d5fac0a3d 100644
--- a/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.pas
+++ b/components/rx/trunk/demos/rxdbgrid/RxDBGrid_Filter/unit1.pas
@@ -5,7 +5,7 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, rxdbgrid, rxmemds, Forms, Controls, Graphics,
+  Classes, SysUtils, FileUtil, rxdbgrid, rxmemds, Forms, Controls, Graphics, DBGrids,
   Dialogs, StdCtrls, ExtCtrls, db;
 
 type
@@ -16,12 +16,14 @@ type
     Button1: TButton;
     Button2: TButton;
     Button3: TButton;
+    CheckBox1: TCheckBox;
     dsData: TDataSource;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
     Panel1: TPanel;
     rxDataID_R: TLongintField;
+    rxDataMEMO: TMemoField;
     RxDBGrid1: TRxDBGrid;
     rxData: TRxMemoryData;
     rxDataCODE: TLongintField;
@@ -31,6 +33,7 @@ type
     procedure Button1Click(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure Button3Click(Sender: TObject);
+    procedure CheckBox1Change(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure rxDataAfterInsert(DataSet: TDataSet);
   private
@@ -55,7 +58,7 @@ begin
   rxData.Open;
   for i:=1 to 20 do
   begin
-    rxData.AppendRecord([i, i mod 4, Format('Line %d', [i])]);
+    rxData.AppendRecord([i, i mod 4, Format('Line %d', [i]), i, 'Строка МЕМО ' + IntToStr(i div 2)]);
     if i mod 5 = 0 then
       rxData.AppendRecord([null, null, 'Пустая строка']);
   end;
@@ -81,6 +84,14 @@ begin
   Label3.Caption:=RxDBGrid1.ColumnByFieldName('ID_R').Filter.CurrentValues.Text;
 end;
 
+procedure TForm1.CheckBox1Change(Sender: TObject);
+begin
+  if CheckBox1.Checked then
+    RxDBGrid1.Options:=RxDBGrid1.Options + [dgDisplayMemoText]
+  else
+    RxDBGrid1.Options:=RxDBGrid1.Options - [dgDisplayMemoText];
+end;
+
 procedure TForm1.rxDataAfterInsert(DataSet: TDataSet);
 begin
   rxDataID_R.AsInteger:=rxData.RecordCount + 1;
diff --git a/components/rx/trunk/rx.lpk b/components/rx/trunk/rx.lpk
index 6025320b9..f3d962d83 100644
--- a/components/rx/trunk/rx.lpk
+++ b/components/rx/trunk/rx.lpk
@@ -9,7 +9,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rx_laz"/>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)/$(LCLWidgetType)"/>
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
@@ -53,7 +53,6 @@
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
 </CONFIG>
diff --git a/components/rx/trunk/rx_sort_fbdataset.lpk b/components/rx/trunk/rx_sort_fbdataset.lpk
index e5092ed0a..1c2888db2 100644
--- a/components/rx/trunk/rx_sort_fbdataset.lpk
+++ b/components/rx/trunk/rx_sort_fbdataset.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rx_sort_fbdataset"/>
-        <UnitOutputDirectory Value="lib/rx_sort_fbdataset/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rx_sort_fbdataset/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <License Value="LGLPL"/>
diff --git a/components/rx/trunk/rx_sort_ibx.lpk b/components/rx/trunk/rx_sort_ibx.lpk
index 301cb4641..c24d55493 100644
--- a/components/rx/trunk/rx_sort_ibx.lpk
+++ b/components/rx/trunk/rx_sort_ibx.lpk
@@ -7,7 +7,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rx_sort_ibx"/>
-        <UnitOutputDirectory Value="lib/rx_sort_ibx/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rx_sort_ibx/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <Files Count="2">
diff --git a/components/rx/trunk/rx_sort_sqldb.lpk b/components/rx/trunk/rx_sort_sqldb.lpk
index 324621856..ca25cb4b9 100644
--- a/components/rx/trunk/rx_sort_sqldb.lpk
+++ b/components/rx/trunk/rx_sort_sqldb.lpk
@@ -7,7 +7,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rx_sort_sqldb"/>
-        <UnitOutputDirectory Value="lib/rx_sort_sqldb/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rx_sort_sqldb/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <Version Major="1" Minor="1" Release="1" Build="2"/>
diff --git a/components/rx/trunk/rx_sort_zeos.lpk b/components/rx/trunk/rx_sort_zeos.lpk
index a32665ea4..2f61ab7fc 100644
--- a/components/rx/trunk/rx_sort_zeos.lpk
+++ b/components/rx/trunk/rx_sort_zeos.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rx_sort_zeos"/>
-        <UnitOutputDirectory Value="lib/rx_sort_zeos/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rx_sort_zeos/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <License Value="LGPL"/>
diff --git a/components/rx/trunk/rxdbgrid_export_spreadsheet.lpk b/components/rx/trunk/rxdbgrid_export_spreadsheet.lpk
index c6b104628..149b85af8 100644
--- a/components/rx/trunk/rxdbgrid_export_spreadsheet.lpk
+++ b/components/rx/trunk/rxdbgrid_export_spreadsheet.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rxdbgrid_export_spreadsheet"/>
-        <UnitOutputDirectory Value="lib/rxdbgrid_export_spreadsheet/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rxdbgrid_export_spreadsheet/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <License Value="LGPL"/>
diff --git a/components/rx/trunk/rxdbgrid_print.lpk b/components/rx/trunk/rxdbgrid_print.lpk
index 59e7876e9..b17cdd237 100644
--- a/components/rx/trunk/rxdbgrid_print.lpk
+++ b/components/rx/trunk/rxdbgrid_print.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rxdbgrid_print"/>
-        <UnitOutputDirectory Value="lib/rxdbgrid_print/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rxdbgrid_print/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <Version Major="1" Minor="1" Release="1" Build="1"/>
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index 815f38803..607b55e14 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -12,7 +12,7 @@
       <SearchPaths>
         <IncludeFiles Value="rxdb;rxcontrols"/>
         <OtherUnitFiles Value="rxdb;rxcontrols"/>
-        <UnitOutputDirectory Value="lib\rxcontrols\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\rxcontrols\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
@@ -26,7 +26,7 @@ Copyright (c) 1998 Master-Bank
 translate to Lazarus by alexs in 2005 - 2018"/>
     <License Value="LGPL"/>
     <Version Major="3" Minor="3" Release="1" Build="220"/>
-    <Files Count="71">
+    <Files Count="70">
       <Item1>
         <Filename Value="registerrx.pas"/>
         <HasRegisterProc Value="True"/>
@@ -207,113 +207,109 @@ translate to Lazarus by alexs in 2005 - 2018"/>
         <UnitName Value="rxsortmemds"/>
       </Item44>
       <Item45>
-        <Filename Value="rxcontrols\rxdice.inc"/>
-        <Type Value="Include"/>
-      </Item45>
-      <Item46>
         <Filename Value="rxcontrols\rxdice.pas"/>
         <UnitName Value="rxDice"/>
-      </Item46>
-      <Item47>
+      </Item45>
+      <Item46>
         <Filename Value="rxcontrols\rxduallist.pas"/>
         <UnitName Value="rxduallist"/>
-      </Item47>
-      <Item48>
+      </Item46>
+      <Item47>
         <Filename Value="rxcontrols\rxfduallst.pas"/>
         <UnitName Value="rxfduallst"/>
-      </Item48>
-      <Item49>
+      </Item47>
+      <Item48>
         <Filename Value="rxcontrols\rxfolderlister.pas"/>
         <UnitName Value="rxfolderlister"/>
-      </Item49>
-      <Item50>
+      </Item48>
+      <Item49>
         <Filename Value="rxcontrols\rxhistory.pas"/>
         <UnitName Value="RXHistory"/>
-      </Item50>
-      <Item51>
+      </Item49>
+      <Item50>
         <Filename Value="rxcontrols\rxinipropstorage.pas"/>
         <UnitName Value="RxIniPropStorage"/>
-      </Item51>
-      <Item52>
+      </Item50>
+      <Item51>
         <Filename Value="rxcontrols\rxlclconst.pas"/>
         <UnitName Value="rxlclconst"/>
-      </Item52>
-      <Item53>
+      </Item51>
+      <Item52>
         <Filename Value="rxcontrols\rxlogin.pas"/>
         <UnitName Value="rxlogin"/>
-      </Item53>
-      <Item54>
+      </Item52>
+      <Item53>
         <Filename Value="rxcontrols\rxmdi.pas"/>
         <UnitName Value="RxMDI"/>
-      </Item54>
-      <Item55>
+      </Item53>
+      <Item54>
         <Filename Value="rxcontrols\rxpagemngr.pas"/>
         <UnitName Value="rxpagemngr"/>
-      </Item55>
-      <Item56>
+      </Item54>
+      <Item55>
         <Filename Value="rxcontrols\rxpickdate.pas"/>
         <UnitName Value="rxpickdate"/>
-      </Item56>
-      <Item57>
+      </Item55>
+      <Item56>
         <Filename Value="rxcontrols\rxshortcutunit.pas"/>
         <UnitName Value="rxShortCutUnit"/>
-      </Item57>
-      <Item58>
+      </Item56>
+      <Item57>
         <Filename Value="rxcontrols\rxspin.pas"/>
         <UnitName Value="rxspin"/>
-      </Item58>
-      <Item59>
+      </Item57>
+      <Item58>
         <Filename Value="rxcontrols\rxswitch.pas"/>
         <UnitName Value="rxswitch"/>
-      </Item59>
-      <Item60>
+      </Item58>
+      <Item59>
         <Filename Value="rxcontrols\rxsystemservices.pas"/>
         <UnitName Value="RxSystemServices"/>
-      </Item60>
-      <Item61>
+      </Item59>
+      <Item60>
         <Filename Value="rxcontrols\rxtbrsetup.pas"/>
         <UnitName Value="rxtbrsetup"/>
-      </Item61>
-      <Item62>
+      </Item60>
+      <Item61>
         <Filename Value="rxcontrols\rxtimeedit.pas"/>
         <UnitName Value="RxTimeEdit"/>
-      </Item62>
-      <Item63>
+      </Item61>
+      <Item62>
         <Filename Value="rxcontrols\rxtoolbar.pas"/>
         <UnitName Value="rxtoolbar"/>
-      </Item63>
-      <Item64>
+      </Item62>
+      <Item63>
         <Filename Value="rxcontrols\rxtooledit.pas"/>
         <UnitName Value="rxtooledit"/>
-      </Item64>
-      <Item65>
+      </Item63>
+      <Item64>
         <Filename Value="rxdb\rxdbgrid_popupfilterunit.pas"/>
         <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
-      </Item65>
-      <Item66>
+      </Item64>
+      <Item65>
         <Filename Value="rxdb\rxdbverticalgrid.pas"/>
         <UnitName Value="rxdbverticalgrid"/>
-      </Item66>
-      <Item67>
+      </Item65>
+      <Item66>
         <Filename Value="rxcontrols\rxlclutils.pas"/>
         <UnitName Value="rxlclutils"/>
-      </Item67>
-      <Item68>
+      </Item66>
+      <Item67>
         <Filename Value="rxcontrols\rxrangesel.pas"/>
         <UnitName Value="RxRangeSel"/>
-      </Item68>
-      <Item69>
+      </Item67>
+      <Item68>
         <Filename Value="rxcontrols\rxxmlpropstorage.pas"/>
         <UnitName Value="RxXMLPropStorage"/>
-      </Item69>
-      <Item70>
+      </Item68>
+      <Item69>
         <Filename Value="rxcontrols\rxswitch.res"/>
         <Type Value="Binary"/>
-      </Item70>
-      <Item71>
+      </Item69>
+      <Item70>
         <Filename Value="rxcontrols\rxpopupnotifier.pas"/>
         <UnitName Value="RxPopupNotifier"/>
-      </Item71>
+      </Item70>
     </Files>
     <LazDoc Paths="docs;\usr\local\share\lazarus\components\rxnew\docs"/>
     <i18n>
diff --git a/components/rx/trunk/rxtools.lpk b/components/rx/trunk/rxtools.lpk
index cb1d7fa2c..6ebd213b8 100644
--- a/components/rx/trunk/rxtools.lpk
+++ b/components/rx/trunk/rxtools.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <OtherUnitFiles Value="rxtools"/>
-        <UnitOutputDirectory Value="lib/rxtools/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/rxtools/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="