diff --git a/Demos/GenerateSwaggerJsonFromCode/GenerateSwagger.res b/Demos/GenerateSwaggerJsonFromCode/GenerateSwagger.res
index 59895be..3f5197d 100644
Binary files a/Demos/GenerateSwaggerJsonFromCode/GenerateSwagger.res and b/Demos/GenerateSwaggerJsonFromCode/GenerateSwagger.res differ
diff --git a/Demos/GenerateUnitFileForMVCFramework/GenerateUnitFileForMVCFramework.res b/Demos/GenerateUnitFileForMVCFramework/GenerateUnitFileForMVCFramework.res
new file mode 100644
index 0000000..050cfa1
Binary files /dev/null and b/Demos/GenerateUnitFileForMVCFramework/GenerateUnitFileForMVCFramework.res differ
diff --git a/Demos/GenerateUnitFileForMVCFramework/Sample.DelphiUnit.Generate.pas b/Demos/GenerateUnitFileForMVCFramework/Sample.DelphiUnit.Generate.pas
index f58e94f..2c3020b 100644
--- a/Demos/GenerateUnitFileForMVCFramework/Sample.DelphiUnit.Generate.pas
+++ b/Demos/GenerateUnitFileForMVCFramework/Sample.DelphiUnit.Generate.pas
@@ -204,7 +204,11 @@ function DelphiVarName(const pVarName: string):string;
 
 procedure TDelphiUnit.AddImplementationConstant(const pName, pValue: string);
 begin
+  {$IF COMPILERVERSION <= 27}
+  fImplementationConstant.Add(pName + ' : ' + pValue);
+  {$ELSE}
   fImplementationConstant.AddPair(pName, pValue);
+  {$ENDIF}
 end;
 
 procedure TDelphiUnit.AddImplementationUnit(const pFilename: string);
@@ -221,12 +225,20 @@ procedure TDelphiUnit.AddImplementationUnit(const pFilename: string);
 
 procedure TDelphiUnit.AddInterfaceVar(const pName: string; pTypeInfo: TUnitTypeDefinition);
 begin
+  {$IF COMPILERVERSION <= 27}
+  fInterfaceVar.Add(pName + ':' + pTypeInfo.TypeName);
+  {$ELSE}
   fInterfaceVar.AddPair(pName, pTypeInfo.TypeName);
+  {$ENDIF}
 end;
 
 procedure TDelphiUnit.AddInterfaceConstant(const pName, pValue: string);
 begin
+  {$IF COMPILERVERSION <= 27}
+  fInterfaceConstant.Add(pName + ':' + pValue);
+  {$ELSE}
   fInterfaceConstant.AddPair(pName, pValue);
+  {$ENDIF}
 end;
 
 procedure TDelphiUnit.AddInterfaceUnit(const pFilename: string);
diff --git a/Demos/GenerateUnitFileForMVCFramework/Sample.Main.fmx b/Demos/GenerateUnitFileForMVCFramework/Sample.Main.fmx
index af8788e..68b3f33 100644
--- a/Demos/GenerateUnitFileForMVCFramework/Sample.Main.fmx
+++ b/Demos/GenerateUnitFileForMVCFramework/Sample.Main.fmx
@@ -7,80 +7,61 @@ object Form1: TForm1
   FormFactor.Width = 320
   FormFactor.Height = 480
   FormFactor.Devices = [Desktop]
-  DesignerMasterStyle = 0
+  DesignerMobile = False
+  DesignerWidth = 0
+  DesignerHeight = 0
+  DesignerDeviceName = ''
+  DesignerOrientation = 0
+  DesignerOSVersion = ''
   object TabControl1: TTabControl
     Align = Bottom
+    Height = 200.000000000000000000
     Position.Y = 40.000000000000000000
-    Size.Width = 605.000000000000000000
-    Size.Height = 645.000000000000000000
-    Size.PlatformDefault = False
     TabIndex = 1
     TabOrder = 2
-    TabPosition = PlatformDefault
-    Sizes = (
-      605s
-      619s
-      605s
-      619s)
+    Width = 200.000000000000000000
     object TabItem1: TTabItem
       CustomIcon = <
         item
         end>
+      Height = 24.000000000000000000
       IsSelected = False
-      Size.Width = 98.000000000000000000
-      Size.Height = 26.000000000000000000
-      Size.PlatformDefault = False
-      StyleLookup = ''
       TabOrder = 0
       Text = 'Swagger JSON'
-      ExplicitSize.cx = 98.000000000000000000
-      ExplicitSize.cy = 26.000000000000000000
+      Width = 94.000000000000000000
       object Memo1: TMemo
         Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
-        DataDetectorTypes = []
         Align = Client
-        Size.Width = 605.000000000000000000
-        Size.Height = 619.000000000000000000
-        Size.PlatformDefault = False
+        Height = 176.000000000000000000
         TabOrder = 0
-        Viewport.Width = 601.000000000000000000
-        Viewport.Height = 615.000000000000000000
+        Width = 200.000000000000000000
       end
     end
     object TabItem2: TTabItem
       CustomIcon = <
         item
         end>
+      Height = 24.000000000000000000
       IsSelected = True
-      Size.Width = 89.000000000000000000
-      Size.Height = 26.000000000000000000
-      Size.PlatformDefault = False
-      StyleLookup = ''
       TabOrder = 0
       Text = 'Delphi Client'
-      ExplicitSize.cx = 136.000000000000000000
-      ExplicitSize.cy = 26.000000000000000000
+      Width = 85.000000000000000000
       object Memo2: TMemo
         Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
-        DataDetectorTypes = []
         Align = Client
-        Size.Width = 605.000000000000000000
-        Size.Height = 619.000000000000000000
-        Size.PlatformDefault = False
+        Height = 176.000000000000000000
         TabOrder = 0
-        Viewport.Width = 601.000000000000000000
-        Viewport.Height = 615.000000000000000000
+        Width = 200.000000000000000000
       end
     end
   end
   object btnGenerateClient: TButton
+    Height = 22.000000000000000000
     Position.X = 24.000000000000000000
     Position.Y = 8.000000000000000000
-    Size.Width = 121.000000000000000000
-    Size.Height = 22.000000000000000000
-    Size.PlatformDefault = False
     TabOrder = 3
     Text = 'Generate Client'
+    Width = 80.000000000000000000
     OnClick = btnGenerateClientClick
   end
 end
diff --git a/Demos/GenerateUnitFileForMVCFramework/Sample.Main.pas b/Demos/GenerateUnitFileForMVCFramework/Sample.Main.pas
index 49c7e70..bfa6f88 100644
--- a/Demos/GenerateUnitFileForMVCFramework/Sample.Main.pas
+++ b/Demos/GenerateUnitFileForMVCFramework/Sample.Main.pas
@@ -37,11 +37,14 @@ interface
   FMX.Forms,
   FMX.Graphics,
   FMX.Dialogs,
+  {$IF COMPILERVERSION >= 28}
   FMX.Controls.Presentation,
-  FMX.StdCtrls,
   FMX.ScrollBox,
+  {$ENDIF}
+  FMX.StdCtrls,
   FMX.Memo,
-  FMX.TabControl;
+  FMX.TabControl,
+  FMX.Layouts;
 
 type
   TForm1 = class(TForm)
diff --git a/Demos/GenerateUnitFileForMVCFramework/Sample.MvcControllerClientFileBuilder.pas b/Demos/GenerateUnitFileForMVCFramework/Sample.MvcControllerClientFileBuilder.pas
index 3ff7db4..5d61ebf 100644
--- a/Demos/GenerateUnitFileForMVCFramework/Sample.MvcControllerClientFileBuilder.pas
+++ b/Demos/GenerateUnitFileForMVCFramework/Sample.MvcControllerClientFileBuilder.pas
@@ -247,9 +247,9 @@ procedure TSwagDocToDelphiRESTClientBuilder.HandleArray(pField : TUnitFieldDefin
   end
   else
   begin
-    OutputDebugString(PChar(pJson.ToJSON));
+    OutputDebugString(PChar(pJson.ToString));
     vJsonVal := (pJson.JsonValue as TJSONObject).Values['items'] as TJSONObject;
-    OutputDebugString(PChar(vJsonVal.ToJSON));
+    OutputDebugString(PChar(vJsonVal.ToString));
     vJsonObj := vJsonVal as TJSONObject;
     vJsonVal := vJsonObj.Values['$ref'];
     OutputDebugString(PChar(vJsonVal.Value));
@@ -267,14 +267,14 @@ procedure TSwagDocToDelphiRESTClientBuilder.ChildType(pDelphiUnit : TDelphiUnit;
   vJsonPropIndex: Integer;
   vValue : string;
 begin
-  OutputDebugString(PChar('Child: ' + pJson.ToJSON));
+  OutputDebugString(PChar('Child: ' + pJson.ToString));
   vTypeInfo := TUnitTypeDefinition.Create;
   vTypeInfo.TypeName := 'T' + CapitalizeFirstLetter(pJson.JSONString.Value);
 
   vJsonProps := (pJson.JSONValue as TJSONObject).Values['properties'] as TJSONObject;
   for vJsonPropIndex := 0 to vJsonProps.Count - 1 do
   begin
-    OutputDebugString(PChar(vJsonProps.Pairs[vJsonPropIndex].ToJSON));
+    OutputDebugString(PChar(vJsonProps.Pairs[vJsonPropIndex].ToString));
     vFieldInfo := TUnitFieldDefinition.Create;
     vFieldInfo.FieldName := vJsonProps.Pairs[vJsonPropIndex].JsonString.Value;
     vTypeObj := vJsonProps.Pairs[vJsonPropIndex].JsonValue as TJSONObject;
@@ -319,7 +319,7 @@ procedure TSwagDocToDelphiRESTClientBuilder.ConvertSwaggerDefinitionsToTypeDefin
     vJsonProps := fSwagDoc.Definitions[DefinitionIndex].JsonSchema.Values['properties'] as TJSONObject;
     for vJsonPropIndex := 0 to vJsonProps.Count - 1 do
     begin
-      OutputDebugString(PChar(vJsonProps.Pairs[vJsonPropIndex].ToJSON));
+      OutputDebugString(PChar(vJsonProps.Pairs[vJsonPropIndex].ToString));
       vFieldInfo := TUnitFieldDefinition.Create;
       vFieldInfo.FieldName := vJsonProps.Pairs[vJsonPropIndex].JsonString.Value;
       vTypeObj := vJsonProps.Pairs[vJsonPropIndex].JsonValue as TJSONObject;
@@ -394,7 +394,7 @@ function TSwagDocToDelphiRESTClientBuilder.ConvertSwaggerTypeToDelphiType(pSwagg
       vJson := pSwaggerType.Schema.JsonSchema;
       if Assigned(vJson) then
       begin
-        OutputDebugString(PChar('TYPE: ' + vJson.ToJson));
+        OutputDebugString(PChar('TYPE: ' + vJson.ToString));
         Result.TypeName := 'array of ' + pSwaggerType.Schema.JsonSchema.Values['type'].Value;
       end
       else
diff --git a/Demos/LoadSwaggerJsonToObject/LoadSwaggerJsonToObject.res b/Demos/LoadSwaggerJsonToObject/LoadSwaggerJsonToObject.res
index c6928c6..ce01c2d 100644
Binary files a/Demos/LoadSwaggerJsonToObject/LoadSwaggerJsonToObject.res and b/Demos/LoadSwaggerJsonToObject/LoadSwaggerJsonToObject.res differ
diff --git a/Demos/SampleApi/Sample.Main.fmx b/Demos/SampleApi/Sample.Main.fmx
index 65d42ba..ce5b414 100644
--- a/Demos/SampleApi/Sample.Main.fmx
+++ b/Demos/SampleApi/Sample.Main.fmx
@@ -7,25 +7,28 @@ object Form1: TForm1
   FormFactor.Width = 320
   FormFactor.Height = 480
   FormFactor.Devices = [Desktop]
-  DesignerMasterStyle = 0
+  DesignerMobile = False
+  DesignerWidth = 0
+  DesignerHeight = 0
+  DesignerDeviceName = ''
+  DesignerOrientation = 0
+  DesignerOSVersion = ''
   object Button1: TButton
+    Height = 22.000000000000000000
     Position.X = 16.000000000000000000
     Position.Y = 8.000000000000000000
     TabOrder = 1
     Text = 'Generate'
+    Width = 80.000000000000000000
     OnClick = Button1Click
   end
   object Memo1: TMemo
     Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
-    DataDetectorTypes = []
     Anchors = [akLeft, akTop, akRight, akBottom]
+    Height = 633.000000000000000000
     Position.X = 16.000000000000000000
     Position.Y = 40.000000000000000000
-    Size.Width = 574.000000000000000000
-    Size.Height = 630.000000000000000000
-    Size.PlatformDefault = False
     TabOrder = 2
-    Viewport.Width = 570.000000000000000000
-    Viewport.Height = 626.000000000000000000
+    Width = 577.000000000000000000
   end
 end
diff --git a/Demos/SampleApi/Sample.Main.pas b/Demos/SampleApi/Sample.Main.pas
index b483e54..85c4d9c 100644
--- a/Demos/SampleApi/Sample.Main.pas
+++ b/Demos/SampleApi/Sample.Main.pas
@@ -35,8 +35,13 @@ interface
   FMX.Forms,
   FMX.Graphics,
   FMX.Dialogs,
+  {$IF COMPILERVERSION >= 28}
   FMX.Controls.Presentation,
-  FMX.StdCtrls, FMX.ScrollBox, FMX.Memo;
+  FMX.ScrollBox,
+  {$ENDIF}
+  FMX.StdCtrls,
+  FMX.Memo,
+  FMX.Layouts;
 
 type
   TForm1 = class(TForm)
diff --git a/Demos/SampleApi/SampleApi.res b/Demos/SampleApi/SampleApi.res
index f0c3bd3..dedd156 100644
Binary files a/Demos/SampleApi/SampleApi.res and b/Demos/SampleApi/SampleApi.res differ
diff --git a/Deploy/swagger.json b/Deploy/swagger.json
index 9d49c4e..4121952 100644
--- a/Deploy/swagger.json
+++ b/Deploy/swagger.json
@@ -5,23 +5,23 @@
     "version":"v1",
     "title":"Sample API",
     "description":"Sample API Description",
-    "termsOfService":"http:\/\/www.apache.org\/licenses\/LICENSE-2.0.txt",
+    "termsOfService":"http://www.apache.org/licenses/LICENSE-2.0.txt",
     "contact":
     {
       "name":"Marcelo Jaloto",
       "email":"marcelojaloto@gmail.com",
-      "url":"https:\/\/github.com\/marcelojaloto\/SwagDoc"
+      "url":"https://github.com/marcelojaloto/SwagDoc"
     }
 ,
     "license":
     {
       "name":"Apache License - Version 2.0, January 2004",
-      "url":"http:\/\/www.apache.org\/licenses\/LICENSE-2.0"
+      "url":"http://www.apache.org/licenses/LICENSE-2.0"
     }
   }
 ,
   "host":"localhost",
-  "basePath":"\/api",
+  "basePath":"/api",
   "schemes":
   [
     "http"
@@ -29,17 +29,17 @@
 ,
   "consumes":
   [
-    "application\/json"
+    "application/json"
   ]
 ,
   "produces":
   [
-    "application\/json"
+    "application/json"
   ]
 ,
   "paths":
   {
-    "\/employees":
+    "/employees":
     {
       "get":
       {
@@ -190,7 +190,7 @@
             "required":true,
             "schema":
             {
-              "$ref":"#\/definitions\/employee"
+              "$ref":"#/definitions/employee"
             }
           }
         ]
@@ -307,7 +307,7 @@
       }
     }
 ,
-    "\/employees\/{id}":
+    "/employees/{id}":
     {
       "get":
       {
@@ -464,7 +464,7 @@
             "required":true,
             "schema":
             {
-              "$ref":"#\/definitions\/employee"
+              "$ref":"#/definitions/employee"
             }
           }
         ]
diff --git a/Source/Json.Schema.Field.Objects.pas b/Source/Json.Schema.Field.Objects.pas
index 83fb6f2..b483bb2 100644
--- a/Source/Json.Schema.Field.Objects.pas
+++ b/Source/Json.Schema.Field.Objects.pas
@@ -89,18 +89,11 @@ function TJsonFieldObject.GetField(const pFieldIndex: Integer): TJsonField;
 end;
 
 function TJsonFieldObject.GetFieldByName(const pName: string): TJsonField;
-var
-  I: Integer;
 begin
   Result := nil;
-  for I := 0 to Pred(fFields.Count) do
-  begin
-    if (UpperCase(fFields[I].Name) = UpperCase(pName)) then
-    begin
-      Result := fFields[I];
+  for Result in fFields do
+    if (UpperCase(Result.Name) = UpperCase(pName)) then
       Break;
-    end;
-  end;
 end;
 
 function TJsonFieldObject.GetFieldsCount: Integer;
diff --git a/Source/Json.Schema.pas b/Source/Json.Schema.pas
index 7892cc4..e08653d 100644
--- a/Source/Json.Schema.pas
+++ b/Source/Json.Schema.pas
@@ -100,7 +100,7 @@ function TJsonSchema.GetJsonFieldClass<T>: TJsonFieldClass;
   case vSchemaKind of
     skObject:
     begin
-      vClass := FindClass(string(PTypeInfo(System.TypeInfo(T))^.NameFld.ToString));
+      vClass := FindClass(string(PTypeInfo(System.TypeInfo(T))^.Name));
       if not vClass.InheritsFrom(TJsonField) then
         raise ETypeNotSupportedByAField.Create(c_ErrorTypeNotSupportedByAField);
       Result := TJsonFieldClass(vClass);
@@ -142,25 +142,25 @@ function TJsonSchema.GetSchemaKind<T>: TSchemaKind;
     tkString, tkUString, tkChar: Result := skString;
     tkRecord:
     begin
-      if vTypeInfo = System.TypeInfo(TGuid) then
+      if (LowerCase(string(vTypeInfo^.Name)) = 'tguid') then
         Result := skGuid
     end;
     tkInteger: Result := skInteger;
     tkInt64: Result := skInt64;
     tkEnumeration:
     begin
-      if vTypeInfo = System.TypeInfo(Boolean) then
+      if (LowerCase(string(vTypeInfo^.Name)) = 'boolean') then
         Result := skBoolean
       else
         Result := skEnumeration;
     end;
     tkFloat:
     begin
-      if vTypeInfo = System.TypeInfo(TDateTime) then
+      if (LowerCase(string(vTypeInfo^.Name)) = 'tdatetime') then
         Result := skDateTime
-      else if vTypeInfo = System.TypeInfo(TDate) then
+      else if (LowerCase(string(vTypeInfo^.Name)) = 'tdate') then
         Result := skDate
-      else if vTypeInfo = System.TypeInfo(TTime) then
+      else if (LowerCase(string(vTypeInfo^.Name)) = 'ttime') then
         Result := skTime
       else
         Result := skNumber;
diff --git a/Source/Swag.Doc.Path.Operation.RequestParameter.pas b/Source/Swag.Doc.Path.Operation.RequestParameter.pas
index 318b9ec..0cdc77b 100644
--- a/Source/Swag.Doc.Path.Operation.RequestParameter.pas
+++ b/Source/Swag.Doc.Path.Operation.RequestParameter.pas
@@ -195,10 +195,18 @@ function TSwagRequestParameter.GenerateJsonObject: TJSONObject;
     vJsonObject.AddPair(c_SwagRequestParameterDefault, fDefault);
 
   if fRequired or (fInLocation = rpiPath) then
+  {$IF COMPILERVERSION <= 27}
+    vJsonObject.AddPair(c_SwagRequestParameterRequired, TJSONTrue.Create);
+  {$ELSE}
     vJsonObject.AddPair(c_SwagRequestParameterRequired, TJSONBool.Create(True));
+  {$ENDIF}
 
   if fAllowEmptyValue and (fInLocation = rpiQuery) or (fInLocation = rpiFormData) then
+  {$IF COMPILERVERSION <= 27}
+    vJsonObject.AddPair(c_SwagRequestParameterAllowEmptyValue, TJSONTrue.Create);
+  {$ELSE}
     vJsonObject.AddPair(c_SwagRequestParameterAllowEmptyValue, TJSONBool.Create(True));
+  {$ENDIF}
 
   if fInLocation = rpiBody then // schema only allow in body parameters
   begin
@@ -242,10 +250,18 @@ procedure TSwagRequestParameter.Load(pJson: TJSONObject);
 
   if Assigned(pJson.Values[c_SwagRequestParameterAllowEmptyValue]) and
     ((fInLocation = rpiQuery) or (fInLocation = rpiFormData)) then
+  {$IF COMPILERVERSION <= 27}
+    fAllowEmptyValue := True;
+  {$ELSE}
     fAllowEmptyValue := (pJson.Values[c_SwagRequestParameterAllowEmptyValue] as TJSONBool).AsBoolean;
+  {$ENDIF}
 
   if Assigned(pJson.Values[c_SwagRequestParameterRequired]) then
+  {$IF COMPILERVERSION <= 27}
+    fRequired := True
+  {$ELSE}
     fRequired := (pJson.Values[c_SwagRequestParameterRequired] as TJSONBool).AsBoolean
+  {$ENDIF}
   else
     fRequired := False;
 
diff --git a/Source/Swag.Doc.Path.Operation.pas b/Source/Swag.Doc.Path.Operation.pas
index 51ef4a1..8ec29bc 100644
--- a/Source/Swag.Doc.Path.Operation.pas
+++ b/Source/Swag.Doc.Path.Operation.pas
@@ -256,7 +256,11 @@ function TSwagPathOperation.GenerateJsonObject: TJSONObject;
     vJsonObject.AddPair(c_SwagPathOperationExternalDocs, fExternalDocs.GenerateJsonObject);
   
   if fDeprecated then
+    {$IF COMPILERVERSION <= 27}
+    vJsonObject.AddPair(c_SwagPathOperationDeprecated, TJSONTrue.Create);
+    {$ELSE}
     vJsonObject.AddPair(c_SwagPathOperationDeprecated, TJSONBool.Create(fDeprecated));
+    {$ENDIF}
   if not fOperationId.IsEmpty then
     vJsonObject.AddPair(c_SwagPathOperationOperationId, fOperationId);
   if (fConsumes.Count > 0) then
diff --git a/Source/Swag.Doc.Path.pas b/Source/Swag.Doc.Path.pas
index cc32685..f77496e 100644
--- a/Source/Swag.Doc.Path.pas
+++ b/Source/Swag.Doc.Path.pas
@@ -169,7 +169,11 @@ procedure TSwagPath.Load(pJson: TJSONObject);
       vOperation.OperationId := vOperationJson.Values['operationId'].Value;
 
     if Assigned(vOperationJson.Values['deprecated']) then
+      {$IF COMPILERVERSION <= 27}
+      vOperation.Deprecated := True;
+      {$ELSE}
       vOperation.Deprecated := (vOperationJson.Values['deprecated'] as TJSONBool).AsBoolean;
+      {$ENDIF}
 
     LoadTags(vOperation, vOperationJson.Values['tags'] as TJSONArray);
     LoadProduces(vOperation, vOperationJson.Values['produces'] as TJSONArray);
diff --git a/Source/SwagDoc.dpk b/Source/SwagDoc.dpk
index cac34e2..b09284f 100644
--- a/Source/SwagDoc.dpk
+++ b/Source/SwagDoc.dpk
@@ -26,7 +26,6 @@ package SwagDoc;
 {$DEFINE DEBUG}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'SwagDoc Library'}
-{$RUNONLY}
 {$IMPLICITBUILD ON}
 
 requires
diff --git a/Source/SwagDoc.dproj b/Source/SwagDoc.dproj
index 4e2d693..4f4c05b 100644
--- a/Source/SwagDoc.dproj
+++ b/Source/SwagDoc.dproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <ProjectGuid>{5B9408E7-46AC-4431-9716-C9EB9F8589B1}</ProjectGuid>
         <MainSource>SwagDoc.dpk</MainSource>
-        <ProjectVersion>18.6</ProjectVersion>
+        <ProjectVersion>19.5</ProjectVersion>
         <FrameworkType>None</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
@@ -18,23 +18,13 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''">
-        <Base_iOSDevice32>true</Base_iOSDevice32>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''">
-        <Base_iOSSimulator>true</Base_iOSSimulator>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
-        <Base_Win32>true</Base_Win32>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
@@ -55,7 +45,6 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <DCC_DcuOutput>..\Lib</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_E>false</DCC_E>
         <DCC_N>false</DCC_N>
@@ -67,35 +56,29 @@
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <SanitizedProjectName>SwagDoc</SanitizedProjectName>
-        <DCC_BplOutput>..\Lib</DCC_BplOutput>
-        <DCC_DcpOutput>..\Lib</DCC_DcpOutput>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Release>3</VerInfo_Release>
         <VerInfo_Locale>1046</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=Jaloto Software;FileDescription=$(MSBuildProjectName);FileVersion=1.0.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <DCC_Description>SwagDoc Library</DCC_Description>
-        <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
+        <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
         <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''">
-        <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
-        <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
+        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Release>0</VerInfo_Release>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
         <DCC_DebugDCUs>true</DCC_DebugDCUs>
@@ -169,79 +152,88 @@
         <BorlandProject>
             <Delphi.Personality>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
                 <Source>
                     <Source Name="MainSource">SwagDoc.dpk</Source>
                 </Source>
             </Delphi.Personality>
-            <Deployment Version="3">
+            <Deployment Version="4">
                 <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
                     <Platform Name="OSX32">
                         <Overwrite>true</Overwrite>
                     </Platform>
-                </DeployFile>
-                <DeployFile LocalName="..\Lib\SwagDoc.bpl" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>SwagDoc.bpl</RemoteName>
+                    <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
-                    <Platform Name="OSX64">
+                <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule"/>
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                    <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
-                    <Platform Name="iOSSimulator">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule"/>
+                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
+                    <Platform Name="OSX32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgsqlite3.dylib" Class="DependencyModule"/>
+                <DeployFile LocalName="..\Lib\SwagDoc.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
-                    <Platform Name="iOSSimulator">
-                        <Overwrite>true</Overwrite>
+                <DeployClass Name="Android_SplashImage470">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
-                </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgsqlite3.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
-                        <Overwrite>true</Overwrite>
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
-                </DeployFile>
-                <DeployClass Name="AdditionalDebugSymbols">
+                </DeployClass>
+                <DeployClass Name="DependencyModule">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidClassesDexFile">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
+                <DeployClass Name="iPhone_LaunchDark2x">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidFileProvider">
-                    <Platform Name="Android">
-                        <RemoteDir>res\xml</RemoteDir>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidGDBServer">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                <DeployClass Name="iPad_SpotLight80">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidLibnativeArmeabiFile">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                <DeployClass Name="iPhone_AppIcon120">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
@@ -251,58 +243,48 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidServiceOutput">
+                <DeployClass Name="AndroidLibnativeX86File">
                     <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <RemoteDir>library\lib\x86</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidSplashImageDef">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
+                <DeployClass Name="ProjectiOSResource">
+                    <Platform Name="iOSDevice">
                         <Operation>1</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashStyles">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
+                    <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidSplashStylesV21">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values-v21</RemoteDir>
+                <DeployClass Name="iPad_AppIcon167">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_DefaultAppIcon">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="Android_LauncherIcon144">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                <DeployClass Name="iPad_Setting58">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon36">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="Android_LauncherIcon48">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
+                <DeployClass Name="AndroidClasses">
+                    <Platform Name="Android64">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon72">
                     <Platform Name="Android">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_LauncherIcon96">
@@ -311,37 +293,67 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="Android_SplashImage426">
+                <DeployClass Name="Android_LauncherIcon144">
                     <Platform Name="Android">
-                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="Android_SplashImage470">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-normal</RemoteDir>
+                <DeployClass Name="Android_NotificationIcon48">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage640">
                     <Platform Name="Android">
-                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_SplashImage960">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-xlarge</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DebugSymbols">
+                <DeployClass Name="UWP_DelphiLogo150">
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo44">
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch320">
+                    <Platform Name="iOSDevice">
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                </DeployClass>
+                <DeployClass Name="DebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
@@ -351,267 +363,520 @@
                         <Operation>1</Operation>
                         <Extensions>.framework</Extensions>
                     </Platform>
-                    <Platform Name="OSX64">
-                        <Operation>1</Operation>
-                        <Extensions>.framework</Extensions>
-                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="OSX32">
+                <DeployClass Name="Android_SplashImage426">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-small</RemoteDir>
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
-                    <Platform Name="OSX64">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSEntitlements"/>
+                <DeployClass Name="iPad_Notification40">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AdditionalDebugSymbols">
+                    <Platform Name="OSX32">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="Win32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
                         <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
                     </Platform>
                 </DeployClass>
-                <DeployClass Required="true" Name="DependencyPackage">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="AndroidClassesDexFile">
+                    <Platform Name="Android">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceInfoPList"/>
+                <DeployClass Name="ProjectiOSInfoPList"/>
+                <DeployClass Name="iPhone_Launch2x">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
-                    <Platform Name="iOSSimulator">
+                </DeployClass>
+                <DeployClass Name="Android_Strings">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
-                    <Platform Name="OSX32">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
-                    <Platform Name="OSX64">
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.bpl</Extensions>
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="File">
+                <DeployClass Name="Android_DefaultAppIcon">
                     <Platform Name="Android">
-                        <Operation>0</Operation>
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>0</Operation>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon96">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon180">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
-                        <Operation>0</Operation>
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>0</Operation>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight120">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iOS_AppStore1024">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="ProjectOSXDebug"/>
+                <DeployClass Name="File">
+                    <Platform Name="iOSDevice">
                         <Operation>0</Operation>
                     </Platform>
-                    <Platform Name="OSX64">
+                    <Platform Name="Android">
                         <Operation>0</Operation>
                     </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>0</Operation>
+                    </Platform>
                 </DeployClass>
-                <DeployClass Name="iPad_Launch1024">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="Android_LauncherIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice64">
+                </DeployClass>
+                <DeployClass Name="iPad_Launch1536">
+                    <Platform Name="iOSDevice">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="iPad_Launch1536">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="Android_LauncherIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice64">
+                </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSSimulator">
+                    <Platform Name="Win32">
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="iPad_Launch2048">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="Android_NotificationIcon36">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice64">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSSimulator">
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon24">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="iPad_Launch768">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Required="true" Name="DependencyPackage">
+                    <Platform Name="iOSDevice">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
-                    <Platform Name="iOSDevice64">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXInfoPList"/>
+                <DeployClass Name="ProjectiOSDeviceDebug">
+                    <Platform Name="iOSDevice">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="iPhone_Launch320">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="ProjectiOSLaunchScreen"/>
+                <DeployClass Name="iPhone_Setting87">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch2048">
+                    <Platform Name="iOSDevice">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidGDBServer">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXEntitlements"/>
+                <DeployClass Name="Android_Colors">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
-                    <Platform Name="iOSDevice32">
+                    <Platform Name="iOSDevice">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark3x">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSSimulator">
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight80">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="iPhone_Launch640x1136">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="AndroidSplashImageDef">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch3x">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSSimulator">
+                </DeployClass>
+                <DeployClass Name="ProjectOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectAndroidManifest">
+                <DeployClass Name="AndroidSplashStylesV21">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Android">
+                        <RemoteDir>res\values-v21</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceDebug">
-                    <Platform Name="iOSDevice32">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                <DeployClass Name="AndroidServiceOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon152">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
-                <DeployClass Name="ProjectiOSEntitlements"/>
-                <DeployClass Name="ProjectiOSInfoPList"/>
-                <DeployClass Name="ProjectiOSResource">
-                    <Platform Name="iOSDevice32">
+                <DeployClass Name="iPhone_Notification40">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch1024">
+                    <Platform Name="iOSDevice">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectOSXDebug"/>
-                <DeployClass Name="ProjectOSXEntitlements"/>
-                <DeployClass Name="ProjectOSXInfoPList"/>
-                <DeployClass Name="ProjectOSXResource">
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\Resources</RemoteDir>
+                <DeployClass Name="ProjectiOSSimulatorInfoPList"/>
+                <DeployClass Name="AndroidLibnativeArmeabiv7aFile">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\Resources</RemoteDir>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting58">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch768">
+                    <Platform Name="iOSDevice">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
                 <DeployClass Required="true" Name="ProjectOutput">
+                    <Platform Name="iOSDevice">
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="iOSDevice32">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch2x">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage640">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_LaunchDark2x">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch640x1136">
+                    <Platform Name="iOSDevice">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="Linux64">
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStyles">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="OSX32">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="OSX64">
+                </DeployClass>
+                <DeployClass Name="AndroidFileProvider">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\xml</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
+                    <Platform Name="Android">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectUWPManifest">
-                    <Platform Name="Win32">
+                <DeployClass Name="Android_LauncherIcon192">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="Win64">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="UWP_DelphiLogo150">
-                    <Platform Name="Win32">
-                        <RemoteDir>Assets</RemoteDir>
+                <DeployClass Name="iPhone_Notification60">
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="Win64">
-                        <RemoteDir>Assets</RemoteDir>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="UWP_DelphiLogo44">
-                    <Platform Name="Win32">
-                        <RemoteDir>Assets</RemoteDir>
+                <DeployClass Name="Android_LauncherIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
-                    <Platform Name="Win64">
-                        <RemoteDir>Assets</RemoteDir>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon72">
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
+                <DeployClass Name="ProjectAndroidManifest">
+                    <Platform Name="Android">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSSimARM64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
             </Deployment>
             <Platforms>
                 <Platform value="Android">False</Platform>
-                <Platform value="iOSDevice32">False</Platform>
-                <Platform value="iOSDevice64">False</Platform>
-                <Platform value="iOSSimulator">False</Platform>
-                <Platform value="OSX32">False</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>