diff --git a/lcl/actnlist.pas b/lcl/actnlist.pas
index 35cf3f7790..d65da8e84c 100644
--- a/lcl/actnlist.pas
+++ b/lcl/actnlist.pas
@@ -237,12 +237,13 @@ type
     property HelpType;
     property Hint;
     property ImageIndex;
-    property OnExecute;
-    property OnHint;
-    property OnUpdate;
     property SecondaryShortCuts;
     property ShortCut;
     property Visible;
+
+    property OnExecute;
+    property OnHint;
+    property OnUpdate;
   end;
 
 
diff --git a/lcl/arrow.pp b/lcl/arrow.pp
index c51c37d844..fc73393c37 100644
--- a/lcl/arrow.pp
+++ b/lcl/arrow.pp
@@ -61,6 +61,14 @@ type
     property Constraints;
     property Enabled;
     property Hint;
+    property ParentColor;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShadowType: TShadowType read FShadowType write SetShadowType default stEtchedIn;
+    property ShadowColor: TColor read FShadowColor write SetShadowColor default cl3DShadow;
+    property ShowHint;
+    property Visible;
+
     property OnChangeBounds;
     property OnClick;
     property OnContextPopup;
@@ -82,13 +90,6 @@ type
     property OnPaint;
     property OnResize;
     property OnStartDrag;
-    property ParentColor;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShadowType: TShadowType read FShadowType write SetShadowType default stEtchedIn;
-    property ShadowColor: TColor read FShadowColor write SetShadowColor default cl3DShadow;
-    property ShowHint;
-    property Visible;
   end;
 
 procedure Register;
diff --git a/lcl/buttonpanel.pas b/lcl/buttonpanel.pas
index 1c16dceaa4..380090237b 100644
--- a/lcl/buttonpanel.pas
+++ b/lcl/buttonpanel.pas
@@ -134,6 +134,11 @@ type
     property TabOrder;
     property DefaultButton;
     property Spacing;
+    property ShowButtons;
+    property ShowGlyphs;
+    property ShowBevel;
+    property Visible;
+
     property OnClick;
     property OnDblClick;
     property OnDragDrop;
@@ -152,10 +157,6 @@ type
     property OnMouseWheelUp;
     property OnResize;
     property OnUTF8KeyPress;
-    property ShowButtons;
-    property ShowGlyphs;
-    property ShowBevel;
-    property Visible;
   end;
 
 procedure Register;
diff --git a/lcl/buttons.pp b/lcl/buttons.pp
index 55d9ae8988..906761da94 100644
--- a/lcl/buttons.pp
+++ b/lcl/buttons.pp
@@ -266,6 +266,18 @@ type
     property Images;
     property ImageIndex;
     property ImageWidth;
+    property ParentBidiMode;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property PressedImageIndex;
+//    property SelectedImageIndex;
+    property ShowHint;
+    property Spacing;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnChangeBounds;
     property OnClick;
     property OnContextPopup;
@@ -288,17 +300,6 @@ type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBidiMode;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property PressedImageIndex;
-//    property SelectedImageIndex;
-    property ShowHint;
-    property Spacing;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
 
@@ -471,6 +472,13 @@ type
     property Spacing;
     property Transparent;
     property Visible;
+    property ShowCaption;
+    property ShowHint;
+    property ParentBidiMode;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+
     property OnClick;
     property OnContextPopup;
     property OnDblClick;
@@ -489,12 +497,6 @@ type
     property OnResize;
     property OnStartDrag;
     property OnChangeBounds;
-    property ShowCaption;
-    property ShowHint;
-    property ParentBidiMode;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
   end;
 
   { To override the default TBitBtn glyphs set GetDefaultBitBtnGlyph below.
diff --git a/lcl/calendar.pp b/lcl/calendar.pp
index b0f7db87bb..8cf2f9310b 100644
--- a/lcl/calendar.pp
+++ b/lcl/calendar.pp
@@ -149,6 +149,13 @@ type
     property Hint;
     property MinDate;
     property MaxDate;
+    property ParentDoubleBuffered;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -174,12 +181,6 @@ type
     property OnResize;
     property OnUTF8KeyPress;
     property OnYearChanged;
-    property ParentDoubleBuffered;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
 procedure Register;
diff --git a/lcl/checklst.pas b/lcl/checklst.pas
index 2f37982eaf..d6958fae26 100644
--- a/lcl/checklst.pas
+++ b/lcl/checklst.pas
@@ -113,6 +113,19 @@ type
     property ItemHeight;
     property ItemIndex;
     property MultiSelect;
+    property ParentBidiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property Sorted;
+    property Style;
+    property TabOrder;
+    property TabStop;
+    property TopIndex;
+    property Visible;
+
     property OnChangeBounds;
     property OnClick;
     property OnClickCheck;
@@ -145,18 +158,6 @@ type
     property OnShowHint;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBidiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property Sorted;
-    property Style;
-    property TabOrder;
-    property TabStop;
-    property TopIndex;
-    property Visible;
   end;
 
 
diff --git a/lcl/colorbox.pas b/lcl/colorbox.pas
index 1f4ada1cb1..db10de1a2d 100644
--- a/lcl/colorbox.pas
+++ b/lcl/colorbox.pas
@@ -123,6 +123,16 @@ type
     property Font;
     property ItemHeight;
     property ItemWidth;
+    property ParentBidiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -150,15 +160,6 @@ type
     property OnStartDrag;
     property OnSelect;
     property OnUTF8KeyPress;
-    property ParentBidiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
   { TCustomColorListBox }
diff --git a/lcl/comboex.pas b/lcl/comboex.pas
index 664c73e44f..4e22cbfb7e 100644
--- a/lcl/comboex.pas
+++ b/lcl/comboex.pas
@@ -214,6 +214,19 @@ type
     property ItemIndex;
     property ItemWidth;
     property MaxLength;
+    property ParentBidiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property Style;
+    property StyleEx;
+    property TabOrder;
+    property TabStop;
+    property Text;
+    property TextHint;
+    property Visible;
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -244,19 +257,6 @@ type
     property OnStartDock;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBidiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property Style;
-    property StyleEx;
-    property TabOrder;
-    property TabStop;
-    property Text;
-    property TextHint;
-    property Visible;
   end;
 
   { TCheckComboItemState }
@@ -355,6 +355,18 @@ type
     property Items;
     property ItemWidth;
     property MaxLength;
+    property ParentBidiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property Sorted;
+    property TabOrder;
+    property TabStop;
+    property Text;
+    property TextHint;
+    property Visible;
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -384,18 +396,6 @@ type
     property OnStartDrag;
     property OnSelect;
     property OnUTF8KeyPress;
-    property ParentBidiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property Sorted;
-    property TabOrder;
-    property TabStop;
-    property Text;
-    property TextHint;
-    property Visible;
   end;
 
 procedure Register;
diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index a7c4bd800d..62972168c3 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -541,6 +541,16 @@ type
     property Height stored False;
     property ImageIndex;
     property Left stored False;
+    property PageIndex stored False;
+    property ParentBiDiMode;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabVisible default True;
+    property Top stored False;
+    property Width stored False;
+
     property OnContextPopup;
     property OnDragDrop;
     property OnDragOver;
@@ -559,15 +569,6 @@ type
     property OnResize;
     property OnShow;
     property OnStartDrag;
-    property PageIndex stored False;
-    property ParentBiDiMode;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabVisible default True;
-    property Top stored False;
-    property Width stored False;
   end;
 
   { TPageControl }
@@ -624,6 +625,7 @@ type
     property Images;
     property ImagesWidth;
     property MultiLine;
+    property Options;
     //property OwnerDraw;
     property ParentBiDiMode;
     property ParentFont;
@@ -641,6 +643,7 @@ type
     property TabStop;
     property TabWidth;
     property Visible;
+
     property OnChange;
     property OnChanging;
     property OnCloseTabClicked;
@@ -668,7 +671,6 @@ type
     property OnStartDock;
     property OnStartDrag;
     property OnUnDock;
-    property Options;
   end;
 
   TTabControl = class;
@@ -896,6 +898,15 @@ type
     property DragMode;
     property Enabled;
     property Font;
+    property Options;
+    property ParentBiDiMode;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property Visible;
+
     property OnChangeBounds;
     property OnContextPopup;
     property OnDockDrop;
@@ -919,14 +930,6 @@ type
     property OnStartDock;
     property OnStartDrag;
     property OnUnDock;
-    property Options;
-    property ParentBiDiMode;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property Visible;
   end;
 
   { Custom draw }
@@ -1733,6 +1736,7 @@ type
     property ToolTips;
     property Visible;
     property ViewStyle;
+
     property OnAdvancedCustomDraw;
     property OnAdvancedCustomDrawItem;
     property OnAdvancedCustomDrawSubItem;
@@ -1857,6 +1861,21 @@ type
     property Hint;
     property Max;
     property Min;
+    property Orientation;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property Position;
+    property ShowHint;
+    property Smooth;
+    property Step;
+    property Style;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+    property BarShowText;
+
     property OnContextPopup;
     property OnDragDrop;
     property OnDragOver;
@@ -1873,20 +1892,6 @@ type
     property OnMouseWheelUp;
     property OnStartDock;
     property OnStartDrag;
-    property Orientation;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property Position;
-    property ShowHint;
-    property Smooth;
-    property Step;
-    property Style;
-    property TabOrder;
-    property TabStop;
-    property Visible;
-    property BarShowText;
   end;
  
 
@@ -2009,6 +2014,18 @@ type
     property Max;
     property Min;
     property MinRepeatInterval;
+    property Orientation;
+    property ParentColor;
+    property ParentShowHint;
+    property PopupMenu;
+    property Position;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Thousands;
+    property Flat;
+    property Visible;
+    property Wrap;
     property OnChanging;
     property OnChangingEx;
     property OnClick;
@@ -2026,18 +2043,6 @@ type
     property OnMouseWheelHorz;
     property OnMouseWheelLeft;
     property OnMouseWheelRight;
-    property Orientation;
-    property ParentColor;
-    property ParentShowHint;
-    property PopupMenu;
-    property Position;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Thousands;
-    property Flat;
-    property Visible;
-    property Wrap;
   end;
 
 
@@ -2190,6 +2195,14 @@ type
     property Indeterminate: Boolean read FIndeterminate write SetIndeterminate default False;
     property Marked: Boolean read FMarked write SetMarked default False;
     property MenuItem: TMenuItem read FMenuItem write SetMenuItem;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowCaption: boolean read FShowCaption write SetShowCaption default true;
+    property ShowHint;
+    property Style: TToolButtonStyle read FStyle write SetStyle default tbsButton;
+    property Visible;
+    property Width stored IsWidthStored;
+    property Wrap: Boolean read FWrap write SetWrap default False;
     property OnArrowClick: TNotifyEvent read FOnArrowClick write FOnArrowClick;
     property OnClick;
     property OnContextPopup;
@@ -2207,14 +2220,6 @@ type
     property OnMouseWheelUp;
     property OnStartDock;
     property OnStartDrag;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowCaption: boolean read FShowCaption write SetShowCaption default true;
-    property ShowHint;
-    property Style: TToolButtonStyle read FStyle write SetStyle default tbsButton;
-    property Visible;
-    property Width stored IsWidthStored;
-    property Wrap: Boolean read FWrap write SetWrap default False;
   end;
 
   { TToolBarEnumerator }
@@ -2765,7 +2770,6 @@ type
     property LineSize: Integer read FLineSize write SetLineSize default 1;
     property Max: Integer read FMax write SetMax default 10;
     property Min: Integer read FMin write SetMin default 0;
-    property OnChange: TNotifyEvent read FOnChange write FOnChange;
     property Orientation: TTrackBarOrientation read FOrientation write SetOrientation default trHorizontal;
     property PageSize: Integer read FPageSize write SetPageSize default 2;
     property Position: Integer read FPosition write SetPosition;
@@ -2777,6 +2781,8 @@ type
     property TabStop default True;
     property TickMarks: TTickMark read FTickMarks write SetTickMarks default tmBottomRight;
     property TickStyle: TTickStyle read FTickStyle write SetTickStyle default tsAuto;
+
+    property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
   
   
@@ -2798,6 +2804,25 @@ type
     property LineSize;
     property Max;
     property Min;
+    property Orientation;
+    property PageSize;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property Position;
+    property Reversed;
+    property ScalePos;
+    property SelEnd;
+    property SelStart;
+    property ShowHint;
+    property ShowSelRange;
+    property TabOrder;
+    property TabStop;
+    property TickMarks;
+    property TickStyle;
+    property Visible;
+
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -2824,24 +2849,6 @@ type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Orientation;
-    property PageSize;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property Position;
-    property Reversed;
-    property ScalePos;
-    property SelEnd;
-    property SelStart;
-    property ShowHint;
-    property ShowSelRange;
-    property TabOrder;
-    property TabStop;
-    property TickMarks;
-    property TickStyle;
-    property Visible;
   end;
   
 { TTreeNode }
@@ -3826,6 +3833,11 @@ type
     property Tag;
     property ToolTips;
     property Visible;
+    property Options;
+    property Items;
+    property TreeLineColor;
+    property TreeLinePenStyle;
+
     property OnAddition;
     property OnAdvancedCustomDraw;
     property OnAdvancedCustomDrawItem;
@@ -3876,13 +3888,8 @@ type
     property OnShowHint;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Options;
-    property Items;
-    property TreeLineColor;
-    property TreeLinePenStyle;
   end;
 
-
   TTVGetNodeText = function(Node: TTreeNode): string of object;
 
   { TTreeNodeExpandedState }
diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp
index 8601dcd06e..22976f8d21 100644
--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@@ -247,6 +247,7 @@ Type
     property TabStop;
     property TextHint;
     property Visible;
+
     property OnChange;
     property OnClick;
     property OnContextPopup;
@@ -315,6 +316,7 @@ Type
     property FocusControl;
     property Font;
     property Layout;
+    property OptimalFill;
     property ParentBidiMode;
     property ParentColor;
     property ParentFont;
@@ -325,6 +327,7 @@ Type
     property Transparent;
     property Visible;
     property WordWrap;
+
     property OnClick;
     property OnDblClick;
     property OnDragDrop;
@@ -342,7 +345,6 @@ Type
     property OnContextPopup;
     property OnResize;
     property OnStartDrag;
-    property OptimalFill;
   end;
 
   { TCustomDBListBox }
@@ -410,6 +412,20 @@ Type
     property ItemHeight;
     property Items;
     property MultiSelect;
+    property Options;
+    property ParentBiDiMode;
+    property ParentDoubleBuffered;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly;
+    property ShowHint;
+    property Sorted;
+    property Style;
+    property TabOrder;
+    property TabStop;
+    property TopIndex;
+    property Visible;
+
     property OnClick;
     property OnContextPopup;
     property OnDblClick;
@@ -433,19 +449,6 @@ Type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Options;
-    property ParentBiDiMode;
-    property ParentDoubleBuffered;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly;
-    property ShowHint;
-    property Sorted;
-    property Style;
-    property TabOrder;
-    property TabStop;
-    property TopIndex;
-    property Visible;
   end;
 
 
@@ -515,6 +518,21 @@ Type
     property EmptyValue: String read GetEmptyValue write SetEmptyValue;
     property DisplayEmpty: String read GetDisplayEmpty write SetDisplayEmpty;
 //    property MultiSelect;
+    property Options;
+    property ParentBiDiMode;
+    property ParentDoubleBuffered;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly;
+    property ScrollListDataset: Boolean read GetScrollListDataset write SetScrollListDataset default False;
+    property ShowHint;
+    property Sorted;
+//    property Style;
+    property TabOrder;
+    property TabStop;
+    property TopIndex;
+    property Visible;
+
     property OnClick;
     property OnContextPopup;
     property OnDblClick;
@@ -539,20 +557,6 @@ Type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Options;
-    property ParentBiDiMode;
-    property ParentDoubleBuffered;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly;
-    property ScrollListDataset: Boolean read GetScrollListDataset write SetScrollListDataset default False;
-    property ShowHint;
-    property Sorted;
-//    property Style;
-    property TabOrder;
-    property TabStop;
-    property TopIndex;
-    property Visible;
   end;
 
 
@@ -614,6 +618,19 @@ Type
     property Enabled;
     property Font;
     property Items write SetItems;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Values: TStrings read FValues write SetValues;
+    property Visible;
+
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
     property OnChangeBounds;
     property OnClick;
@@ -631,18 +648,6 @@ Type
     property OnMouseWheelUp;
     property OnResize;
     property OnStartDrag;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Values: TStrings read FValues write SetValues;
-    property Visible;
   end;
 
 
@@ -700,6 +705,20 @@ Type
     property Enabled;
     property Font;
     property Hint;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property ValueChecked: string read FValueChecked write SetValueChecked stored NonDefaultValueChecked;
+    property ValueUnchecked: string read FValueUnchecked write SetValueUnchecked stored NonDefaultValueUnchecked;
+    property Visible;
+
     property OnChange;
     property OnClick;
     property OnContextPopup;
@@ -717,19 +736,6 @@ Type
     property OnMouseWheelDown;
     property OnMouseWheelUp;
     property OnStartDrag;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property ValueChecked: string read FValueChecked write SetValueChecked stored NonDefaultValueChecked;
-    property ValueUnchecked: string read FValueUnchecked write SetValueUnchecked stored NonDefaultValueUnchecked;
-    property Visible;
   end;
   
   
@@ -815,6 +821,19 @@ Type
     property Items;
     property ItemWidth;
     property MaxLength default -1;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly;
+    property ShowHint;
+    property Sorted;
+    property Style;
+    property TabOrder;
+    property TabStop;
+    property Visible;
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -843,19 +862,6 @@ Type
     property OnSelect;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly;
-    property ShowHint;
-    property Sorted;
-    property Style;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
 
@@ -943,6 +949,20 @@ Type
     property NullValueKey: TShortCut read GetNullValueKey write SetNullValueKey default 0;
     property EmptyValue: String read GetEmptyValue write SetEmptyValue;
     property DisplayEmpty: String read GetDisplayEmpty write SetDisplayEmpty;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly;
+    property ScrollListDataset: Boolean read GetScrollListDataset write SetScrollListDataset default False;
+    property ShowHint;
+    property Sorted;
+    property Style;
+    property TabOrder;
+    property TabStop;
+    property Visible;
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -971,20 +991,6 @@ Type
     property OnSelect;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly;
-    property ScrollListDataset: Boolean read GetScrollListDataset write SetScrollListDataset default False;
-    property ShowHint;
-    property Sorted;
-    property Style;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
   { TDBMemo }
@@ -1041,6 +1047,21 @@ Type
     property Enabled;
     property Font;
     property MaxLength;
+    property ParentBiDiMode;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
+    property ScrollBars;
+    property ShowHint;
+    property TabOrder;
+    property Tabstop;
+    property Visible;
+    property WantReturns;
+    property WantTabs;
+    property WordWrap;
+
     property OnChange;
     property OnClick;
     property OnContextPopup;
@@ -1065,20 +1086,6 @@ Type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
-    property ScrollBars;
-    property ShowHint;
-    property TabOrder;
-    property Tabstop;
-    property Visible;
-    property WantReturns;
-    property WantTabs;
-    property WordWrap;
   end;
   
   
@@ -1121,6 +1128,17 @@ Type
     property DragMode;
     property Enabled;
     property Font;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnClick;
     property OnContextPopup;
     property OnDblClick;
@@ -1143,16 +1161,6 @@ Type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
   
 
@@ -1216,6 +1224,18 @@ Type
     property DragMode;
     property KeepOriginXWhenClipped;
     property KeepOriginYWhenClipped;
+    property ParentShowHint;
+    property Proportional;
+    property QuickDraw: Boolean read FQuickDraw write FQuickDraw default True;
+    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
+    property ShowHint;
+    property Stretch;
+    property StretchInEnabled;
+    property StretchOutEnabled;
+    property Transparent;
+    property Visible;
+    property WriteHeader: Boolean read FWriteHeader write FWriteHeader default True;
+
     property OnClick;
     property OnContextPopup;
     property OnDblClick;
@@ -1235,17 +1255,6 @@ Type
     property OnMouseWheelUp;
     property OnResize;
     property OnStartDrag;
-    property ParentShowHint;
-    property Proportional;
-    property QuickDraw: Boolean read FQuickDraw write FQuickDraw default True;
-    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
-    property ShowHint;
-    property Stretch;
-    property StretchInEnabled;
-    property StretchOutEnabled;
-    property Transparent;
-    property Visible;
-    property WriteHeader: Boolean read FWriteHeader write FWriteHeader default True;
   end;
 
   { TDBCalendar }
@@ -1294,6 +1303,7 @@ Type
     property DragMode;
     property ParentDoubleBuffered;
     property Visible;
+
     property OnClick;
     property OnContextPopup;
     property OnDragDrop;
@@ -1488,6 +1498,20 @@ type
     property Flat;
     property Font;
     property Hints;
+    property Options;
+    property ParentBidiMode;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property TabStop default False;
+    property Visible;
+    property VisibleButtons;
+    property Images;
+
     property OnClick;
     property OnContextPopup;
     property OnDblClick;
@@ -1506,19 +1530,6 @@ type
     property OnMouseWheelUp;
     property OnResize;
     property OnStartDrag;
-    property Options;
-    property ParentBidiMode;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property TabStop default False;
-    property Visible;
-    property VisibleButtons;
-    property Images;
   end;
 
 procedure ChangeDataSource(AControl: TControl; Link: TDataLink;
diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas
index 7318cf0c90..532ce68ed5 100644
--- a/lcl/dbgrids.pas
+++ b/lcl/dbgrids.pas
@@ -634,6 +634,7 @@ type
     property TitleStyle;
     property UseXORFeatures;
     property Visible;
+
     property OnCellClick;
     property OnColEnter;
     property OnColExit;
diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index 89d42841ae..35ea7a6443 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -166,6 +166,21 @@ type
     property Layout;
     property MaxLength;
     property NumGlyphs;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PasswordChar;
+    property PopupMenu;
+    property ReadOnly;
+    property ShowHint;
+    property Spacing;
+    property TabOrder;
+    property TabStop;
+    property Text;
+    property TextHint;
+    property Visible;
+
     property OnButtonClick;
     property OnChange;
     property OnClick;
@@ -190,20 +205,6 @@ type
     property OnMouseWheelUp;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PasswordChar;
-    property PopupMenu;
-    property ReadOnly;
-    property ShowHint;
-    property Spacing;
-    property TabOrder;
-    property TabStop;
-    property Text;
-    property TextHint;
-    property Visible;
   end;
 
   TFilterStringOption = (fsoCaseSensitive, fsoMatchOnlyAtStart);
@@ -329,7 +330,10 @@ type
     property Spacing;
     property TabOrder;
     property TabStop;
+    property Text;
+    property TextHint stored IsTextHintStored;
     property Visible;
+
     property OnButtonClick;
     property OnChange;
     property OnClick;
@@ -354,8 +358,6 @@ type
     property OnMouseWheelUp;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Text;
-    property TextHint stored IsTextHintStored;
   end;
 
   { TFileNameEdit }
@@ -446,7 +448,10 @@ type
     property Spacing;
     property TabOrder;
     property TabStop;
+    property Text;
+    property TextHint;
     property Visible;
+
     property OnButtonClick;
     property OnChange;
     property OnClick;
@@ -471,8 +476,6 @@ type
     property OnMouseWheelUp;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Text;
-    property TextHint;
   end;
 
 
@@ -545,7 +548,10 @@ type
     property TabOrder;
     property Spacing;
     property TabStop;
+    property Text;
+    property TextHint;
     property Visible;
+
     property OnButtonClick;
     property OnChange;
     property OnClick;
@@ -570,8 +576,6 @@ type
     property OnMouseWheelUp;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Text;
-    property TextHint;
   end;
 
 
@@ -673,6 +677,19 @@ type
     property Font;
     property Layout;
     property MaxLength;
+    property ParentBidiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabStop;
+    property TabOrder;
+    property Spacing;
+    property Visible;
+    property Text;
+    property TextHint;
+
     property OnButtonClick;
     property OnChange;
     property OnChangeBounds;
@@ -695,18 +712,6 @@ type
     property OnMouseWheelUp;
     property OnResize;
     property OnUTF8KeyPress;
-    property ParentBidiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabStop;
-    property TabOrder;
-    property Spacing;
-    property Visible;
-    property Text;
-    property TextHint;
   end;
   
   { TTimeEdit }
@@ -778,6 +783,20 @@ type
       property FocusOnButtonClick;
       property Font;
       property MaxLength;
+      property ParentBidiMode;
+      property ParentColor;
+      property ParentFont;
+      property ParentShowHint;
+      property PopupMenu;
+      property ShowHint;
+      property SimpleLayout: Boolean read GetLayout write SetLayout default True;
+      property Spacing;
+      property TabStop;
+      property TabOrder;
+      property Visible;
+      property Text;
+      property TextHint;
+
       property OnButtonClick;
       property OnChange;
       property OnChangeBounds;
@@ -800,19 +819,6 @@ type
       property OnMouseWheelUp;
       property OnResize;
       property OnUTF8KeyPress;
-      property ParentBidiMode;
-      property ParentColor;
-      property ParentFont;
-      property ParentShowHint;
-      property PopupMenu;
-      property ShowHint;
-      property SimpleLayout: Boolean read GetLayout write SetLayout default True;
-      property Spacing;
-      property TabStop;
-      property TabOrder;
-      property Visible;
-      property Text;
-      property TextHint;
   end;
   
 
@@ -892,7 +898,10 @@ type
     property Spacing;
     property TabOrder;
     property TabStop;
+    property Text;
+    property TextHint;
     property Visible;
+
     property OnButtonClick;
     property OnChange;
     property OnClick;
@@ -917,8 +926,6 @@ type
     property OnMouseWheelUp;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property Text;
-    property TextHint;
   end;
 
 const
diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp
index e3b615403e..bf9645c376 100644
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@@ -68,6 +68,13 @@ type
     property Top stored False;
     property Width stored False;
     property Height stored False;
+    property ParentBiDiMode;
+    property ParentShowHint;
+    property PopupMenu;
+    property TabOrder stored False;
+    property TabStop;
+    property Visible stored False;
+
     property OnContextPopup;
     property OnEnter;
     property OnExit;
@@ -80,12 +87,6 @@ type
     property OnMouseWheelDown;
     property OnMouseWheelUp;
     property OnResize;
-    property ParentBiDiMode;
-    property ParentShowHint;
-    property PopupMenu;
-    property TabOrder stored False;
-    property TabStop;
-    property Visible stored False;
   end;
 
   { TUNBPages }
@@ -161,7 +162,14 @@ type
     property DragCursor;
     property DragMode;
     property Enabled;
-//    property OnChange;
+//    property Options;
+//    property PageIndex;
+    property ParentBiDiMode;
+    property PopupMenu;
+    property TabOrder;
+    property TabStop;
+
+    //    property OnChange;
     property OnChangeBounds;
 //    property OnChanging;
     property OnContextPopup;
@@ -180,12 +188,6 @@ type
     property OnMouseWheelUp;
     property OnResize;
     property OnStartDrag;
-//    property Options;
-//    property PageIndex;
-    property ParentBiDiMode;
-    property PopupMenu;
-    property TabOrder;
-    property TabStop;
   end;
 
   { Timer }
@@ -294,6 +296,10 @@ type
     property Enabled;
     property ParentShowHint;
     property Pen: TPen read FPen write SetPen;
+    property Shape: TShapeType read FShape write SetShape default stRectangle;
+    property ShowHint;
+    property Visible;
+
     property OnChangeBounds;
     property OnDragDrop;
     property OnDragOver;
@@ -314,9 +320,6 @@ type
     property OnResize;
     property OnStartDock;
     property OnStartDrag;
-    property Shape: TShapeType read FShape write SetShape default stRectangle;
-    property ShowHint;
-    property Visible;
   end;
 
 
@@ -421,6 +424,16 @@ type
     property DoubleBuffered;
     property Height;
     property MinSize;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentShowHint;
+    property PopupMenu;
+    property ResizeAnchor;
+    property ResizeStyle;
+    property ShowHint;
+    property Visible;
+    property Width;
+
     property OnCanOffset;
     property OnCanResize;
     property OnChangeBounds;
@@ -432,15 +445,6 @@ type
     property OnMouseWheelLeft;
     property OnMouseWheelRight;
     property OnPaint;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentShowHint;
-    property PopupMenu;
-    property ResizeAnchor;
-    property ResizeStyle;
-    property ShowHint;
-    property Visible;
-    property Width;
   end;
 
 
@@ -600,6 +604,17 @@ type
     property ImageIndex;
     property ImageWidth;
     property Images;
+    property ParentShowHint;
+    property Picture;
+    property PopupMenu;
+    property Proportional;
+    property ShowHint;
+    property Stretch;
+    property StretchOutEnabled;
+    property StretchInEnabled;
+    property Transparent;
+    property Visible;
+
     property OnChangeBounds;
     property OnClick;
     property OnContextPopup;
@@ -623,16 +638,6 @@ type
     property OnPaintBackground;
     property OnResize;
     property OnStartDrag;
-    property ParentShowHint;
-    property Picture;
-    property PopupMenu;
-    property Proportional;
-    property ShowHint;
-    property Stretch;
-    property StretchOutEnabled;
-    property StretchInEnabled;
-    property Transparent;
-    property Visible;
   end;
 
 
@@ -665,6 +670,7 @@ type
     property ShowHint;
     property Style: TBevelStyle read FStyle write SetStyle default bsLowered;
     property Visible;
+
     property OnChangeBounds;
     property OnResize;
     property OnMouseDown;
@@ -777,6 +783,18 @@ type
     property Font;
     property ItemIndex;
     property Items;
+    property ParentBackground;
+    property ParentBidiMode;
+    property ParentFont;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnChangeBounds;
     property OnClick;
     property OnDblClick;
@@ -802,17 +820,6 @@ type
     property OnSelectionChanged;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBackground;
-    property ParentBidiMode;
-    property ParentFont;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
 
@@ -899,6 +906,18 @@ type
     property Enabled;
     property Font;
     property Items;
+    property ParentBackground;
+    property ParentBiDiMode;
+    property ParentFont;
+    property ParentColor;
+    property ParentDoubleBuffered;
+    property ParentShowHint;
+    property PopupMenu;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnChangeBounds;
     property OnClick;
     property OnDblClick;
@@ -922,17 +941,6 @@ type
     property OnResize;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBackground;
-    property ParentBiDiMode;
-    property ParentFont;
-    property ParentColor;
-    property ParentDoubleBuffered;
-    property ParentShowHint;
-    property PopupMenu;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
 
@@ -1052,6 +1060,7 @@ type
     property Text;
     property TextHint;
     property Visible;
+
     property OnChange;
     property OnClick;
     property OnDblClick;
@@ -1176,6 +1185,7 @@ type
     property VerticalAlignment;
     property Visible;
     property Wordwrap;
+
     property OnChangeBounds;
     property OnClick;
     property OnContextPopup;
diff --git a/lcl/extdlgs.pas b/lcl/extdlgs.pas
index 65970e7022..c02c309da3 100644
--- a/lcl/extdlgs.pas
+++ b/lcl/extdlgs.pas
@@ -221,12 +221,13 @@ type
   published
     property Date: TDateTime read FDate write FDate;
     property DisplaySettings: TDisplaySettings read FDisplaySettings write FDisplaySettings default DefaultDisplaySettings;
+    property OKCaption: TCaption read FOKCaption write FOKCaption;
+    property CancelCaption: TCaption read FCancelCaption write FCancelCaption;
+
     property OnDayChanged: TNotifyEvent read FDayChanged write FDayChanged;
     property OnMonthChanged: TNotifyEvent read FMonthChanged write FMonthChanged;
     property OnYearChanged: TNotifyEvent read FYearChanged write FYearChanged;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
-    property OKCaption: TCaption read FOKCaption write FOKCaption;
-    property CancelCaption: TCaption read FCancelCaption write FCancelCaption;
   end;
 
 procedure Register;
diff --git a/lcl/filectrl.pp b/lcl/filectrl.pp
index 4b1ac7acdb..3b13feeed2 100644
--- a/lcl/filectrl.pp
+++ b/lcl/filectrl.pp
@@ -102,6 +102,19 @@ Type
     property ItemHeight;
     property Mask;
     property MultiSelect;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentShowHint;
+    property ParentFont;
+    property PopupMenu;
+    property ShowHint;
+    property Sorted;
+    property Style;
+    property TabOrder;
+    property TabStop;
+    property TopIndex;
+    property Visible;
+    { events }
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -127,18 +140,6 @@ Type
     property OnSelectionChange;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentShowHint;
-    property ParentFont;
-    property PopupMenu;
-    property ShowHint;
-    property Sorted;
-    property Style;
-    property TabOrder;
-    property TabStop;
-    property TopIndex;
-    property Visible;
   end;
 
   { TCustomFilterComboBox }
diff --git a/lcl/forms.pp b/lcl/forms.pp
index 64cae20f2b..23460b0714 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -367,6 +367,18 @@ type
     property Enabled;
     property Font;
     property LCLVersion: string read FLCLVersion write FLCLVersion stored LCLVersionIsStored;
+    property ParentBackground;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property Scaled;
+    property ShowHint;
+    property TabOrder;
+    property TabStop;
+    property Visible;
+
     property OnClick;
     property OnConstrainedResize;
     property OnContextPopup;
@@ -395,17 +407,6 @@ type
     property OnStartDock;
     property OnStartDrag;
     property OnUnDock;
-    property ParentBackground;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property Scaled;
-    property ShowHint;
-    property TabOrder;
-    property TabStop;
-    property Visible;
   end;
 
 
@@ -882,6 +883,26 @@ type
     property Icon;
     property KeyPreview;
     property Menu;
+    property ParentBiDiMode;
+    property ParentDoubleBuffered;
+    property ParentFont;
+    property PixelsPerInch;
+    property PopupMenu;
+    property PopupMode;
+    property PopupParent;
+    property Position;
+    property SessionProperties;
+    property ScreenSnap;
+    property ShowHint;
+    property ShowInTaskBar;
+    property SnapBuffer;
+    property SnapOptions;
+    property UseDockManager;
+    property LCLVersion: string read FLCLVersion write FLCLVersion stored LCLVersionIsStored;
+    property Scaled;
+    property Visible;
+    property WindowState;
+
     property OnActivate;
     property OnChangeBounds;
     property OnClick;
@@ -925,25 +946,6 @@ type
     property OnUnDock;
     property OnUTF8KeyPress;
     property OnWindowStateChange;
-    property ParentBiDiMode;
-    property ParentDoubleBuffered;
-    property ParentFont;
-    property PixelsPerInch;
-    property PopupMenu;
-    property PopupMode;
-    property PopupParent;
-    property Position;
-    property SessionProperties;
-    property ScreenSnap;
-    property ShowHint;
-    property ShowInTaskBar;
-    property SnapBuffer;
-    property SnapOptions;
-    property UseDockManager;
-    property LCLVersion: string read FLCLVersion write FLCLVersion stored LCLVersionIsStored;
-    property Scaled;
-    property Visible;
-    property WindowState;
   end;
 
   TFormClass = class of TForm;
diff --git a/lcl/groupededit.pp b/lcl/groupededit.pp
index 99f4332cc6..b72b33e208 100644
--- a/lcl/groupededit.pp
+++ b/lcl/groupededit.pp
@@ -365,6 +365,21 @@ type
     property Hint;
     property Layout;
     property MaxLength;
+    property ParentBiDiMode;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PasswordChar;
+    property PopupMenu;
+    property ReadOnly;
+    property ShowHint;
+    property Spacing;
+    property TabOrder;
+    property TabStop;
+    property Text;
+    property TextHint;
+    property Visible;
+    {events }
     //property OnBuddyClick;
     property OnChange;
     property OnClick;
@@ -389,20 +404,6 @@ type
     property OnMouseWheelUp;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property ParentBiDiMode;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PasswordChar;
-    property PopupMenu;
-    property ReadOnly;
-    property ShowHint;
-    property Spacing;
-    property TabOrder;
-    property TabStop;
-    property Text;
-    property TextHint;
-    property Visible;
   end;
 
 
diff --git a/lcl/maskedit.pp b/lcl/maskedit.pp
index b480a7ff94..9c74518b93 100644
--- a/lcl/maskedit.pp
+++ b/lcl/maskedit.pp
@@ -356,6 +356,12 @@ const
     property TabOrder;
     property TabStop;
     property Visible;
+
+    property EditMask;
+    property Text;
+    property TextHint;
+    property SpaceChar;
+
     property OnChange;
     property OnClick;
     property OnDblClick;
@@ -380,10 +386,6 @@ const
     property OnStartDock;
     property OnStartDrag;
     property OnUTF8KeyPress;
-    property EditMask;
-    property Text;
-    property TextHint;
-    property SpaceChar;
   end;
 
 function FormatMaskText(const AEditMask: string; const Value: string ): string;
diff --git a/lcl/pairsplitter.pas b/lcl/pairsplitter.pas
index e59a3fb957..9faad65c1f 100644
--- a/lcl/pairsplitter.pas
+++ b/lcl/pairsplitter.pas
@@ -67,6 +67,10 @@ type
     property Constraints;
     property Cursor;
     property Enabled;
+    property ShowHint;
+    property ParentShowHint;
+    property PopupMenu;
+
     property OnMouseDown;
     property OnMouseEnter;
     property OnMouseLeave;
@@ -76,9 +80,6 @@ type
     property OnMouseWheelDown;
     property OnMouseWheelUp;
     property OnResize;
-    property ShowHint;
-    property ParentShowHint;
-    property PopupMenu;
   end;
   
   { TCustomPairSplitter }
@@ -134,6 +135,13 @@ type
     property Color;
     property Cursor;
     property Enabled;
+    property ParentShowHint;
+    property PopupMenu;
+    property Position;
+    property ShowHint;
+    property SplitterType;
+    property Visible;
+
     property OnMouseDown;
     property OnMouseEnter;
     property OnMouseLeave;
@@ -144,12 +152,6 @@ type
     property OnMouseWheelUp;
     property OnResize;
     property OnChangeBounds;
-    property ParentShowHint;
-    property PopupMenu;
-    property Position;
-    property ShowHint;
-    property SplitterType;
-    property Visible;
   end;
   
 procedure Register;
diff --git a/lcl/shellctrls.pas b/lcl/shellctrls.pas
index 4328e4cac5..a2a8a63818 100644
--- a/lcl/shellctrls.pas
+++ b/lcl/shellctrls.pas
@@ -185,6 +185,14 @@ type
     property Tag;
     property ToolTips;
     property Visible;
+    property Options;
+    property TreeLineColor;
+    property TreeLinePenStyle;
+    property ExpandSignColor;
+    { TCustomShellTreeView properties }
+    property ObjectTypes;
+    property ShellListView;
+
     property OnAddItem;
     property OnAdvancedCustomDraw;
     property OnAdvancedCustomDrawItem;
@@ -223,13 +231,6 @@ type
     property OnShowHint;
     property OnSortCompare;
     property OnUTF8KeyPress;
-    property Options;
-    property TreeLineColor;
-    property TreeLinePenStyle;
-    property ExpandSignColor;
-    { TCustomShellTreeView properties }
-    property ObjectTypes;
-    property ShellListView;
   end;
 
   { TCustomShellListView }
@@ -352,6 +353,11 @@ type
     property ToolTips;
     property Visible;
     property ViewStyle default vsReport;
+    { TCustomShellListView properties }
+    property ObjectTypes;
+    property Root;
+    property ShellTreeView;
+
 //    property OnAdvancedCustomDraw;
 //    property OnAdvancedCustomDrawItem;
 //    property OnAdvancedCustomDrawSubItem;
@@ -390,10 +396,6 @@ type
     property OnUTF8KeyPress;
     property OnAddItem;
     property OnFileAdded;
-    { TCustomShellListView properties }
-    property ObjectTypes;
-    property Root;
-    property ShellTreeView;
   end;
 
   { TShellTreeNode }
diff --git a/lcl/spin.pp b/lcl/spin.pp
index 596a025840..8d2d47f624 100644
--- a/lcl/spin.pp
+++ b/lcl/spin.pp
@@ -105,6 +105,17 @@ type
     property Increment;
     property MaxValue;
     property MinValue;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly;
+    property ShowHint;
+    property TabStop;
+    property TabOrder;
+    property Value;
+    property Visible;
+
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -127,16 +138,6 @@ type
     property OnMouseWheelRight;
     property OnResize;
     property OnUTF8KeyPress;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly;
-    property ShowHint;
-    property TabStop;
-    property TabOrder;
-    property Value;
-    property Visible;
   end;
   
   
@@ -184,6 +185,17 @@ type
     property Increment;
     property MaxValue;
     property MinValue;
+    property ParentColor;
+    property ParentFont;
+    property ParentShowHint;
+    property PopupMenu;
+    property ReadOnly;
+    property ShowHint;
+    property TabStop;
+    property TabOrder;
+    property Value;
+    property Visible;
+
     property OnChange;
     property OnChangeBounds;
     property OnClick;
@@ -206,16 +218,6 @@ type
     property OnMouseWheelRight;
     property OnResize;
     property OnUTF8KeyPress;
-    property ParentColor;
-    property ParentFont;
-    property ParentShowHint;
-    property PopupMenu;
-    property ReadOnly;
-    property ShowHint;
-    property TabStop;
-    property TabOrder;
-    property Value;
-    property Visible;
   end;