diff --git a/Source/fmx/WrapFmxComCtrls.pas b/Source/fmx/WrapFmxComCtrls.pas
index 56ef5497..a8f5ddd9 100644
--- a/Source/fmx/WrapFmxComCtrls.pas
+++ b/Source/fmx/WrapFmxComCtrls.pas
@@ -1,3 +1,5 @@
+{$I Definition.Inc}
+
 unit WrapFmxComCtrls;
 
 interface
diff --git a/Source/fmx/WrapFmxDialogs.pas b/Source/fmx/WrapFmxDialogs.pas
index 7a474ea2..26926f68 100644
--- a/Source/fmx/WrapFmxDialogs.pas
+++ b/Source/fmx/WrapFmxDialogs.pas
@@ -1,3 +1,5 @@
+{$I Definition.Inc}
+
 unit WrapFmxDialogs;
 
 interface
diff --git a/Source/fmx/WrapFmxForms.pas b/Source/fmx/WrapFmxForms.pas
index 6c31996c..646bfd03 100644
--- a/Source/fmx/WrapFmxForms.pas
+++ b/Source/fmx/WrapFmxForms.pas
@@ -1,3 +1,5 @@
+{$I Definition.Inc}
+
 unit WrapFmxForms;
 
 interface
@@ -72,6 +74,17 @@   TPyDelphiFrame = class(TPyDelphiControl)
     property DelphiObject: TFrame read GetDelphiObject write SetDelphiObject;
   end;
 
+  TPyDelphiScreen = class(TPyDelphiComponent)
+  private
+    function GetDelphiObject: TScreen;
+    procedure SetDelphiObject(const Value: TScreen);
+  public
+    // Class methods
+    class function DelphiObjectClass: TClass; override;
+    // Properties
+    property DelphiObject: TScreen read GetDelphiObject write SetDelphiObject;
+  end;
+
 implementation
 
 uses
@@ -118,6 +131,7 @@ procedure TFormsRegistration.RegisterWrappers(
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPopupForm);
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiForm);
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiFrame);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiScreen);
 end;
 
 { TPyDelphiApplication }
@@ -224,6 +238,23 @@ procedure TPyDelphiFrame.SetDelphiObject(const Value: TFrame);
   inherited DelphiObject := Value;
 end;
 
+{ TPyDelphiScreen }
+
+class function TPyDelphiScreen.DelphiObjectClass: TClass;
+begin
+  Result := TScreen;
+end;
+
+function TPyDelphiScreen.GetDelphiObject: TScreen;
+begin
+  Result := TScreen(inherited DelphiObject);
+end;
+
+procedure TPyDelphiScreen.SetDelphiObject(const Value: TScreen);
+begin
+  inherited DelphiObject := Value;
+end;
+
 initialization
   RegisteredUnits.Add(TFormsRegistration.Create);
 
diff --git a/Source/fmx/WrapFmxGrids.pas b/Source/fmx/WrapFmxGrids.pas
new file mode 100644
index 00000000..d7b714c8
--- /dev/null
+++ b/Source/fmx/WrapFmxGrids.pas
@@ -0,0 +1,550 @@
+unit WrapFmxGrids;
+
+interface
+
+uses
+  FMX.Grid, WrapFmxControls, WrapFmxScrollBox;
+
+type
+  TPyDelphiColumn = class(TPyDelphiControl)
+  private
+    function  GetDelphiObject: TColumn;
+    procedure SetDelphiObject(const Value: TColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiStringColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TStringColumn;
+    procedure SetDelphiObject(const Value: TStringColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TStringColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiProgressColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TProgressColumn;
+    procedure SetDelphiObject(const Value: TProgressColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TProgressColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCheckColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TCheckColumn;
+    procedure SetDelphiObject(const Value: TCheckColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCheckColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiDateTimeColumnBase = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TDateTimeColumnBase;
+    procedure SetDelphiObject(const Value: TDateTimeColumnBase);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TDateTimeColumnBase read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiDateTimeColumn = class(TPyDelphiDateTimeColumnBase)
+  private
+    function  GetDelphiObject: TDateTimeColumn;
+    procedure SetDelphiObject(const Value: TDateTimeColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TDateTimeColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiTimeColumn = class(TPyDelphiDateTimeColumnBase)
+  private
+    function  GetDelphiObject: TTimeColumn;
+    procedure SetDelphiObject(const Value: TTimeColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TTimeColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiDateColumn = class(TPyDelphiDateTimeColumnBase)
+  private
+    function  GetDelphiObject: TDateColumn;
+    procedure SetDelphiObject(const Value: TDateColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TDateColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiPopupColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TPopupColumn;
+    procedure SetDelphiObject(const Value: TPopupColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TPopupColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiImageColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TImageColumn;
+    procedure SetDelphiObject(const Value: TImageColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TImageColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomNumberColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TCustomNumberColumn;
+    procedure SetDelphiObject(const Value: TCustomNumberColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomNumberColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCurrencyColumn = class(TPyDelphiCustomNumberColumn)
+  private
+    function  GetDelphiObject: TCurrencyColumn;
+    procedure SetDelphiObject(const Value: TCurrencyColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCurrencyColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiFloatColumn = class(TPyDelphiCustomNumberColumn)
+  private
+    function  GetDelphiObject: TFloatColumn;
+    procedure SetDelphiObject(const Value: TFloatColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TFloatColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiIntegerColumn = class(TPyDelphiCustomNumberColumn)
+  private
+    function  GetDelphiObject: TIntegerColumn;
+    procedure SetDelphiObject(const Value: TIntegerColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TIntegerColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiGlyphColumn = class(TPyDelphiColumn)
+  private
+    function  GetDelphiObject: TGlyphColumn;
+    procedure SetDelphiObject(const Value: TGlyphColumn);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TGlyphColumn read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomGrid = class(TPyDelphiCustomPresentedScrollBox)
+  private
+    function  GetDelphiObject: TCustomGrid;
+    procedure SetDelphiObject(const Value: TCustomGrid);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomGrid read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiGrid = class(TPyDelphiCustomGrid)
+  private
+    function GetDelphiObject: TGrid;
+    procedure SetDelphiObject(const Value: TGrid);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TGrid read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiStringGrid = class(TPyDelphiCustomGrid)
+  private
+    function GetDelphiObject: TStringGrid;
+    procedure SetDelphiObject(const Value: TStringGrid);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TStringGrid read GetDelphiObject write SetDelphiObject;
+  end;
+
+implementation
+
+uses
+  WrapDelphi;
+
+{ Register the wrappers, the globals and the constants }
+type
+  TGridsRegistration = class(TRegisteredUnit)
+  public
+    function Name : string; override;
+    procedure RegisterWrappers(APyDelphiWrapper : TPyDelphiWrapper); override;
+    procedure DefineVars(APyDelphiWrapper : TPyDelphiWrapper); override;
+  end;
+
+{ TGridsRegistration }
+
+procedure TGridsRegistration.DefineVars(APyDelphiWrapper: TPyDelphiWrapper);
+begin
+  inherited;
+end;
+
+function TGridsRegistration.Name: string;
+begin
+  Result := 'Grids';
+end;
+
+procedure TGridsRegistration.RegisterWrappers(
+  APyDelphiWrapper: TPyDelphiWrapper);
+begin
+  inherited;
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiStringColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiProgressColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCheckColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiDateTimeColumnBase);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiDateTimeColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiTimeColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiDateColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPopupColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiImageColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomNumberColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCurrencyColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiFloatColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiIntegerColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiGlyphColumn);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomGrid);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiGrid);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiStringGrid);
+end;
+
+{ TPyDelphiColumn }
+
+class function TPyDelphiColumn.DelphiObjectClass: TClass;
+begin
+  Result := TColumn;
+end;
+
+function TPyDelphiColumn.GetDelphiObject: TColumn;
+begin
+  Result := TColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiColumn.SetDelphiObject(const Value: TColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiStringColumn }
+
+class function TPyDelphiStringColumn.DelphiObjectClass: TClass;
+begin
+  Result := TStringColumn;
+end;
+
+function TPyDelphiStringColumn.GetDelphiObject: TStringColumn;
+begin
+  Result := TStringColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiStringColumn.SetDelphiObject(const Value: TStringColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiProgressColumn }
+
+class function TPyDelphiProgressColumn.DelphiObjectClass: TClass;
+begin
+  Result := TProgressColumn;
+end;
+
+function TPyDelphiProgressColumn.GetDelphiObject: TProgressColumn;
+begin
+  Result := TProgressColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiProgressColumn.SetDelphiObject(const Value: TProgressColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCheckColumn }
+
+class function TPyDelphiCheckColumn.DelphiObjectClass: TClass;
+begin
+  Result := TCheckColumn;
+end;
+
+function TPyDelphiCheckColumn.GetDelphiObject: TCheckColumn;
+begin
+  Result := TCheckColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCheckColumn.SetDelphiObject(const Value: TCheckColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiDateTimeColumnBase }
+
+class function TPyDelphiDateTimeColumnBase.DelphiObjectClass: TClass;
+begin
+  Result := TDateTimeColumnBase;
+end;
+
+function TPyDelphiDateTimeColumnBase.GetDelphiObject: TDateTimeColumnBase;
+begin
+  Result := TDateTimeColumnBase(inherited DelphiObject);
+end;
+
+procedure TPyDelphiDateTimeColumnBase.SetDelphiObject(
+  const Value: TDateTimeColumnBase);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiDateTimeColumn }
+
+class function TPyDelphiDateTimeColumn.DelphiObjectClass: TClass;
+begin
+  Result := TDateTimeColumn;
+end;
+
+function TPyDelphiDateTimeColumn.GetDelphiObject: TDateTimeColumn;
+begin
+  Result := TDateTimeColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiDateTimeColumn.SetDelphiObject(const Value: TDateTimeColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiTimeColumn }
+
+class function TPyDelphiTimeColumn.DelphiObjectClass: TClass;
+begin
+  Result := TTimeColumn;
+end;
+
+function TPyDelphiTimeColumn.GetDelphiObject: TTimeColumn;
+begin
+  Result := TTimeColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiTimeColumn.SetDelphiObject(const Value: TTimeColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiDateColumn }
+
+class function TPyDelphiDateColumn.DelphiObjectClass: TClass;
+begin
+  Result := TDateColumn;
+end;
+
+function TPyDelphiDateColumn.GetDelphiObject: TDateColumn;
+begin
+  Result := TDateColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiDateColumn.SetDelphiObject(const Value: TDateColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiPopupColumn }
+
+class function TPyDelphiPopupColumn.DelphiObjectClass: TClass;
+begin
+  Result := TPopupColumn;
+end;
+
+function TPyDelphiPopupColumn.GetDelphiObject: TPopupColumn;
+begin
+  Result := TPopupColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiPopupColumn.SetDelphiObject(const Value: TPopupColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiImageColumn }
+
+class function TPyDelphiImageColumn.DelphiObjectClass: TClass;
+begin
+  Result := TImageColumn;
+end;
+
+function TPyDelphiImageColumn.GetDelphiObject: TImageColumn;
+begin
+  Result := TImageColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiImageColumn.SetDelphiObject(const Value: TImageColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomNumberColumn }
+
+class function TPyDelphiCustomNumberColumn.DelphiObjectClass: TClass;
+begin
+  Result := TCustomNumberColumn;
+end;
+
+function TPyDelphiCustomNumberColumn.GetDelphiObject: TCustomNumberColumn;
+begin
+  Result := TCustomNumberColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomNumberColumn.SetDelphiObject(
+  const Value: TCustomNumberColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCurrencyColumn }
+
+class function TPyDelphiCurrencyColumn.DelphiObjectClass: TClass;
+begin
+  Result := TCurrencyColumn;
+end;
+
+function TPyDelphiCurrencyColumn.GetDelphiObject: TCurrencyColumn;
+begin
+  Result := TCurrencyColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCurrencyColumn.SetDelphiObject(const Value: TCurrencyColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiFloatColumn }
+
+class function TPyDelphiFloatColumn.DelphiObjectClass: TClass;
+begin
+  Result := TFloatColumn;
+end;
+
+function TPyDelphiFloatColumn.GetDelphiObject: TFloatColumn;
+begin
+  Result := TFloatColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiFloatColumn.SetDelphiObject(const Value: TFloatColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiIntegerColumn }
+
+class function TPyDelphiIntegerColumn.DelphiObjectClass: TClass;
+begin
+  Result := TIntegerColumn;
+end;
+
+function TPyDelphiIntegerColumn.GetDelphiObject: TIntegerColumn;
+begin
+  Result := TIntegerColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiIntegerColumn.SetDelphiObject(const Value: TIntegerColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiGlyphColumn }
+
+class function TPyDelphiGlyphColumn.DelphiObjectClass: TClass;
+begin
+  Result := TGlyphColumn;
+end;
+
+function TPyDelphiGlyphColumn.GetDelphiObject: TGlyphColumn;
+begin
+  Result := TGlyphColumn(inherited DelphiObject);
+end;
+
+procedure TPyDelphiGlyphColumn.SetDelphiObject(const Value: TGlyphColumn);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiGlyphCustomGrid }
+
+class function TPyDelphiCustomGrid.DelphiObjectClass: TClass;
+begin
+  Result := TCustomGrid;
+end;
+
+function TPyDelphiCustomGrid.GetDelphiObject: TCustomGrid;
+begin
+  Result := TCustomGrid(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomGrid.SetDelphiObject(const Value: TCustomGrid);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiGrid }
+
+class function TPyDelphiGrid.DelphiObjectClass: TClass;
+begin
+  Result := TGrid;
+end;
+
+function TPyDelphiGrid.GetDelphiObject: TGrid;
+begin
+  Result := TGrid(inherited DelphiObject);
+end;
+
+procedure TPyDelphiGrid.SetDelphiObject(const Value: TGrid);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiStringGrid }
+
+class function TPyDelphiStringGrid.DelphiObjectClass: TClass;
+begin
+  Result := TStringGrid;
+end;
+
+function TPyDelphiStringGrid.GetDelphiObject: TStringGrid;
+begin
+  Result := TStringGrid(inherited DelphiObject);
+end;
+
+procedure TPyDelphiStringGrid.SetDelphiObject(const Value: TStringGrid);
+begin
+  inherited DelphiObject := Value;
+end;
+
+initialization
+  RegisteredUnits.Add(TGridsRegistration.Create);
+
+end.
diff --git a/Source/fmx/WrapFmxLayouts.pas b/Source/fmx/WrapFmxLayouts.pas
new file mode 100644
index 00000000..6df4e249
--- /dev/null
+++ b/Source/fmx/WrapFmxLayouts.pas
@@ -0,0 +1,412 @@
+{$I Definition.Inc}
+
+unit WrapFmxLayouts;
+
+interface
+
+uses
+  FMX.Layouts, FMX.BufferedLayout, WrapDelphi, WrapFmxControls;
+
+type
+  TPyDelphiLayout = class(TPyDelphiControl)
+  private
+    function  GetDelphiObject: TLayout;
+    procedure SetDelphiObject(const Value: TLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiScaledLayout = class(TPyDelphiControl)
+  private
+    function  GetDelphiObject: TScaledLayout;
+    procedure SetDelphiObject(const Value: TScaledLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TScaledLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomScrollBox = class(TPyDelphiStyledControl)
+  private
+    function  GetDelphiObject: TCustomScrollBox;
+    procedure SetDelphiObject(const Value: TCustomScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiScrollBox = class(TPyDelphiCustomScrollBox)
+  private
+    function  GetDelphiObject: TScrollBox;
+    procedure SetDelphiObject(const Value: TScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiVertScrollBox = class(TPyDelphiCustomScrollBox)
+  private
+    function  GetDelphiObject: TVertScrollBox;
+    procedure SetDelphiObject(const Value: TVertScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TVertScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiHorzScrollBox = class(TPyDelphiCustomScrollBox)
+  private
+    function  GetDelphiObject: THorzScrollBox;
+    procedure SetDelphiObject(const Value: THorzScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: THorzScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiFramedScrollBox = class(TPyDelphiCustomScrollBox)
+  private
+    function  GetDelphiObject: TFramedScrollBox;
+    procedure SetDelphiObject(const Value: TFramedScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TFramedScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiFramedVertScrollBox = class(TPyDelphiVertScrollBox)
+  private
+    function  GetDelphiObject: TFramedVertScrollBox;
+    procedure SetDelphiObject(const Value: TFramedVertScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TFramedVertScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiGridLayout = class(TPyDelphiControl)
+  private
+    function  GetDelphiObject: TGridLayout;
+    procedure SetDelphiObject(const Value: TGridLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TGridLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiGridPanelLayout = class(TPyDelphiControl)
+  private
+    function  GetDelphiObject: TGridPanelLayout;
+    procedure SetDelphiObject(const Value: TGridPanelLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TGridPanelLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiFlowLayout = class(TPyDelphiControl)
+  private
+    function  GetDelphiObject: TFlowLayout;
+    procedure SetDelphiObject(const Value: TFlowLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TFlowLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomBufferedLayout = class(TPyDelphiLayout)
+  private
+    function  GetDelphiObject: TCustomBufferedLayout;
+    procedure SetDelphiObject(const Value: TCustomBufferedLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomBufferedLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiBufferedLayout = class(TPyDelphiCustomBufferedLayout)
+  private
+    function  GetDelphiObject: TBufferedLayout;
+    procedure SetDelphiObject(const Value: TBufferedLayout);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TBufferedLayout read GetDelphiObject write SetDelphiObject;
+  end;
+
+implementation
+
+{ Register the wrappers, the globals and the constants }
+type
+  TLayoutsRegistration = class(TRegisteredUnit)
+  public
+    function Name : string; override;
+    procedure RegisterWrappers(APyDelphiWrapper : TPyDelphiWrapper); override;
+    procedure DefineVars(APyDelphiWrapper : TPyDelphiWrapper); override;
+  end;
+
+{ TLayoutsRegistration }
+
+procedure TLayoutsRegistration.DefineVars(APyDelphiWrapper: TPyDelphiWrapper);
+begin
+  inherited;
+end;
+
+function TLayoutsRegistration.Name: string;
+begin
+  Result := 'Layouts';
+end;
+
+procedure TLayoutsRegistration.RegisterWrappers(
+  APyDelphiWrapper: TPyDelphiWrapper);
+begin
+  inherited;
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiLayout);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiScaledLayout);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiVertScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiHorzScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiFramedScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiFramedVertScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiGridLayout);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiGridPanelLayout);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiFlowLayout);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomBufferedLayout);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiBufferedLayout);
+end;
+
+{ TPyDelphiLayout }
+
+class function TPyDelphiLayout.DelphiObjectClass: TClass;
+begin
+  Result := TLayout;
+end;
+
+function TPyDelphiLayout.GetDelphiObject: TLayout;
+begin
+  Result := TLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiLayout.SetDelphiObject(const Value: TLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiScaledLayout }
+
+class function TPyDelphiScaledLayout.DelphiObjectClass: TClass;
+begin
+  Result := TScaledLayout;
+end;
+
+function TPyDelphiScaledLayout.GetDelphiObject: TScaledLayout;
+begin
+  Result := TScaledLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiScaledLayout.SetDelphiObject(const Value: TScaledLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomScrollBox }
+
+class function TPyDelphiCustomScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TCustomScrollBox;
+end;
+
+function TPyDelphiCustomScrollBox.GetDelphiObject: TCustomScrollBox;
+begin
+  Result := TCustomScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomScrollBox.SetDelphiObject(
+  const Value: TCustomScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiScrollBox }
+
+class function TPyDelphiScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TScrollBox;
+end;
+
+function TPyDelphiScrollBox.GetDelphiObject: TScrollBox;
+begin
+  Result := TScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiScrollBox.SetDelphiObject(const Value: TScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiVertScrollBox }
+
+class function TPyDelphiVertScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TVertScrollBox;
+end;
+
+function TPyDelphiVertScrollBox.GetDelphiObject: TVertScrollBox;
+begin
+  Result := TVertScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiVertScrollBox.SetDelphiObject(const Value: TVertScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiHorzScrollBox }
+
+class function TPyDelphiHorzScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := THorzScrollBox;
+end;
+
+function TPyDelphiHorzScrollBox.GetDelphiObject: THorzScrollBox;
+begin
+  Result := THorzScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiHorzScrollBox.SetDelphiObject(const Value: THorzScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiFramedScrollBox }
+
+class function TPyDelphiFramedScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TFramedScrollBox;
+end;
+
+function TPyDelphiFramedScrollBox.GetDelphiObject: TFramedScrollBox;
+begin
+  Result := TFramedScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiFramedScrollBox.SetDelphiObject(
+  const Value: TFramedScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiFramedVertScrollBox }
+
+class function TPyDelphiFramedVertScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TFramedVertScrollBox;
+end;
+
+function TPyDelphiFramedVertScrollBox.GetDelphiObject: TFramedVertScrollBox;
+begin
+  Result := TFramedVertScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiFramedVertScrollBox.SetDelphiObject(
+  const Value: TFramedVertScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiGridLayout }
+
+class function TPyDelphiGridLayout.DelphiObjectClass: TClass;
+begin
+  Result := TGridLayout;
+end;
+
+function TPyDelphiGridLayout.GetDelphiObject: TGridLayout;
+begin
+  Result := TGridLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiGridLayout.SetDelphiObject(const Value: TGridLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiGridPanelLayout }
+
+class function TPyDelphiGridPanelLayout.DelphiObjectClass: TClass;
+begin
+  Result := TGridPanelLayout;
+end;
+
+function TPyDelphiGridPanelLayout.GetDelphiObject: TGridPanelLayout;
+begin
+  Result := TGridPanelLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiGridPanelLayout.SetDelphiObject(
+  const Value: TGridPanelLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiFlowLayout }
+
+class function TPyDelphiFlowLayout.DelphiObjectClass: TClass;
+begin
+  Result := TFlowLayout;
+end;
+
+function TPyDelphiFlowLayout.GetDelphiObject: TFlowLayout;
+begin
+  Result := TFlowLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiFlowLayout.SetDelphiObject(const Value: TFlowLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomBufferedLayout }
+
+class function TPyDelphiCustomBufferedLayout.DelphiObjectClass: TClass;
+begin
+  Result := TCustomBufferedLayout;
+end;
+
+function TPyDelphiCustomBufferedLayout.GetDelphiObject: TCustomBufferedLayout;
+begin
+  Result := TCustomBufferedLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomBufferedLayout.SetDelphiObject(
+  const Value: TCustomBufferedLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiBufferedLayout }
+
+class function TPyDelphiBufferedLayout.DelphiObjectClass: TClass;
+begin
+  Result := TBufferedLayout;
+end;
+
+function TPyDelphiBufferedLayout.GetDelphiObject: TBufferedLayout;
+begin
+  Result := TBufferedLayout(inherited DelphiObject);
+end;
+
+procedure TPyDelphiBufferedLayout.SetDelphiObject(const Value: TBufferedLayout);
+begin
+  inherited DelphiObject := Value;
+end;
+
+initialization
+  RegisteredUnits.Add(TLayoutsRegistration.Create);
+
+end.
diff --git a/Source/fmx/WrapFmxScrollBox.pas b/Source/fmx/WrapFmxScrollBox.pas
new file mode 100644
index 00000000..5caa2b47
--- /dev/null
+++ b/Source/fmx/WrapFmxScrollBox.pas
@@ -0,0 +1,334 @@
+unit WrapFmxScrollBox;
+
+interface
+
+uses
+  FMX.ScrollBox, WrapFmxControls;
+
+type
+  TPyDelphiCustomPresentedScrollBox = class(TPyDelphiPresentedControl)
+  private
+    function GetDelphiObject: TCustomPresentedScrollBox;
+    procedure SetDelphiObject(const Value: TCustomPresentedScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomPresentedScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiPresentedScrollBox = class(TPyDelphiCustomPresentedScrollBox)
+  private
+    function GetDelphiObject: TPresentedScrollBox;
+    procedure SetDelphiObject(const Value: TPresentedScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TPresentedScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomPresentedVertScrollBox = class(TPyDelphiCustomPresentedScrollBox)
+  private
+    function GetDelphiObject: TCustomPresentedVertScrollBox;
+    procedure SetDelphiObject(const Value: TCustomPresentedVertScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomPresentedVertScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiPresentedVertScrollBox = class(TPyDelphiCustomPresentedVertScrollBox)
+  private
+    function GetDelphiObject: TPresentedVertScrollBox;
+    procedure SetDelphiObject(const Value: TPresentedVertScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TPresentedVertScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomPresentedHorzScrollBox = class(TPyDelphiCustomPresentedScrollBox)
+  private
+    function GetDelphiObject: TCustomPresentedHorzScrollBox;
+    procedure SetDelphiObject(const Value: TCustomPresentedHorzScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomPresentedHorzScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiPresentedHorzScrollBox = class(TPyDelphiCustomPresentedHorzScrollBox)
+  private
+    function GetDelphiObject: TPresentedHorzScrollBox;
+    procedure SetDelphiObject(const Value: TPresentedHorzScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TPresentedHorzScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomPresentedFrameScrollBox = class(TPyDelphiCustomPresentedScrollBox)
+  private
+    function GetDelphiObject: TCustomPresentedFramedScrollBox;
+    procedure SetDelphiObject(const Value: TCustomPresentedFramedScrollBox);
+  public
+    class function  DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomPresentedFramedScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiPresentedFrameScrollBox = class(TPyDelphiCustomPresentedFrameScrollBox)
+  private
+    function GetDelphiObject: TPresentedFramedScrollBox;
+    procedure SetDelphiObject(const Value: TPresentedFramedScrollBox);
+  public
+    class function DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TPresentedFramedScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiCustomPresentedFramedVertScrollBox = class(TPyDelphiCustomPresentedVertScrollBox)
+  private
+    function GetDelphiObject: TCustomPresentedFramedVertScrollBox;
+    procedure SetDelphiObject(const Value: TCustomPresentedFramedVertScrollBox);
+  public
+    class function DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TCustomPresentedFramedVertScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+  TPyDelphiPresentedFramedVertScrollBox = class(TPyDelphiCustomPresentedFramedVertScrollBox)
+  private
+    function GetDelphiObject: TPresentedFramedVertScrollBox;
+    procedure SetDelphiObject(const Value: TPresentedFramedVertScrollBox);
+  public
+    class function DelphiObjectClass : TClass; override;
+    // Properties
+    property DelphiObject: TPresentedFramedVertScrollBox read GetDelphiObject write SetDelphiObject;
+  end;
+
+implementation
+
+uses
+  WrapDelphi;
+
+{ Register the wrappers, the globals and the constants }
+type
+  TScrollBoxRegistration = class(TRegisteredUnit)
+  public
+    function Name : string; override;
+    procedure RegisterWrappers(APyDelphiWrapper : TPyDelphiWrapper); override;
+    procedure DefineVars(APyDelphiWrapper : TPyDelphiWrapper); override;
+  end;
+
+{ TScrollBoxRegistration }
+
+procedure TScrollBoxRegistration.DefineVars(APyDelphiWrapper: TPyDelphiWrapper);
+begin
+  inherited;
+end;
+
+function TScrollBoxRegistration.Name: string;
+begin
+  Result := 'ScrollBox';
+end;
+
+procedure TScrollBoxRegistration.RegisterWrappers(
+  APyDelphiWrapper: TPyDelphiWrapper);
+begin
+  inherited;
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPresentedScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPresentedScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPresentedVertScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPresentedVertScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPresentedHorzScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPresentedHorzScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPresentedFrameScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPresentedFrameScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPresentedFramedVertScrollBox);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPresentedFramedVertScrollBox);
+end;
+
+{ TPyDelphiCustomPresentedScrollBox }
+
+class function TPyDelphiCustomPresentedScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TCustomPresentedScrollBox;
+end;
+
+function TPyDelphiCustomPresentedScrollBox.GetDelphiObject: TCustomPresentedScrollBox;
+begin
+  Result := TCustomPresentedScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomPresentedScrollBox.SetDelphiObject(
+  const Value: TCustomPresentedScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiPresentedScrollBox }
+
+class function TPyDelphiPresentedScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TPresentedScrollBox;
+end;
+
+function TPyDelphiPresentedScrollBox.GetDelphiObject: TPresentedScrollBox;
+begin
+  Result := TPresentedScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiPresentedScrollBox.SetDelphiObject(
+  const Value: TPresentedScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomPresentedVertScrollBox }
+
+class function TPyDelphiCustomPresentedVertScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TCustomPresentedVertScrollBox;
+end;
+
+function TPyDelphiCustomPresentedVertScrollBox.GetDelphiObject: TCustomPresentedVertScrollBox;
+begin
+  Result := TCustomPresentedVertScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomPresentedVertScrollBox.SetDelphiObject(
+  const Value: TCustomPresentedVertScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiPresentedVertScrollBox }
+
+class function TPyDelphiPresentedVertScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TPresentedVertScrollBox;
+end;
+
+function TPyDelphiPresentedVertScrollBox.GetDelphiObject: TPresentedVertScrollBox;
+begin
+  Result := TPresentedVertScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiPresentedVertScrollBox.SetDelphiObject(
+  const Value: TPresentedVertScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomPresentedHorzScrollBox }
+
+class function TPyDelphiCustomPresentedHorzScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TCustomPresentedHorzScrollBox;
+end;
+
+function TPyDelphiCustomPresentedHorzScrollBox.GetDelphiObject: TCustomPresentedHorzScrollBox;
+begin
+  Result := TCustomPresentedHorzScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomPresentedHorzScrollBox.SetDelphiObject(
+  const Value: TCustomPresentedHorzScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiPresentedHorzScrollBox }
+
+class function TPyDelphiPresentedHorzScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TPresentedHorzScrollBox;
+end;
+
+function TPyDelphiPresentedHorzScrollBox.GetDelphiObject: TPresentedHorzScrollBox;
+begin
+  Result := TPresentedHorzScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiPresentedHorzScrollBox.SetDelphiObject(
+  const Value: TPresentedHorzScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomPresentedFrameScrollBox }
+
+class function TPyDelphiCustomPresentedFrameScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TCustomPresentedFramedScrollBox;
+end;
+
+function TPyDelphiCustomPresentedFrameScrollBox.GetDelphiObject: TCustomPresentedFramedScrollBox;
+begin
+  Result := TCustomPresentedFramedScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomPresentedFrameScrollBox.SetDelphiObject(
+  const Value: TCustomPresentedFramedScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiPresentedFrameScrollBox }
+
+class function TPyDelphiPresentedFrameScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TPresentedFramedScrollBox;
+end;
+
+function TPyDelphiPresentedFrameScrollBox.GetDelphiObject: TPresentedFramedScrollBox;
+begin
+  Result := TPresentedFramedScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiPresentedFrameScrollBox.SetDelphiObject(
+  const Value: TPresentedFramedScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiCustomPresentedFramedVertScrollBox }
+
+class function TPyDelphiCustomPresentedFramedVertScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TCustomPresentedFramedVertScrollBox;
+end;
+
+function TPyDelphiCustomPresentedFramedVertScrollBox.GetDelphiObject: TCustomPresentedFramedVertScrollBox;
+begin
+  Result := TCustomPresentedFramedVertScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomPresentedFramedVertScrollBox.SetDelphiObject(
+  const Value: TCustomPresentedFramedVertScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TPyDelphiPresentedFramedVertScrollBox }
+
+class function TPyDelphiPresentedFramedVertScrollBox.DelphiObjectClass: TClass;
+begin
+  Result := TPresentedFramedVertScrollBox;
+end;
+
+function TPyDelphiPresentedFramedVertScrollBox.GetDelphiObject: TPresentedFramedVertScrollBox;
+begin
+  Result := TPresentedFramedVertScrollBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiPresentedFramedVertScrollBox.SetDelphiObject(
+  const Value: TPresentedFramedVertScrollBox);
+begin
+  inherited DelphiObject := Value;
+end;
+
+initialization
+  RegisteredUnits.Add(TScrollBoxRegistration.Create);
+
+end.
diff --git a/Source/fmx/WrapFmxShapes.pas b/Source/fmx/WrapFmxShapes.pas
index 95daa234..06c0fa5b 100644
--- a/Source/fmx/WrapFmxShapes.pas
+++ b/Source/fmx/WrapFmxShapes.pas
@@ -1,3 +1,5 @@
+{$I Definition.Inc}
+
 unit WrapFmxShapes;
 
 interface