diff --git a/source/YDW.FMX.ImageWithURLCacheManager.pas b/source/YDW.FMX.ImageWithURLCacheManager.pas
index 4be339d..c4cd2d5 100644
--- a/source/YDW.FMX.ImageWithURLCacheManager.pas
+++ b/source/YDW.FMX.ImageWithURLCacheManager.pas
@@ -225,7 +225,7 @@ procedure TImageWithURLCahceManager.LoadFromCache(AUrl: string;
     Except on E: Exception do begin
       Log('TImageWithURLCahceManager.LoadFromCache(); SyncBitmapLoadFromFile: ' +
           Booltostr(SyncBitmapLoadFromFile, True), E);
-      Raise E;
+      raise;
     end; end;
     {$ENDIF}
   end;
diff --git a/source/YDW.FMX.ImageWithURLManager.pas b/source/YDW.FMX.ImageWithURLManager.pas
index 2890f02..a550c2d 100644
--- a/source/YDW.FMX.ImageWithURLManager.pas
+++ b/source/YDW.FMX.ImageWithURLManager.pas
@@ -128,9 +128,9 @@ procedure TImageWithUrlManager.SubThreadExecute(AValue: IImageWithURL);
 
   function IsValidHTTPURL(const AURL: string): boolean;
   begin
-    Result := AURL.StartsWith('https://', True);
+    Result := AURL.StartsWith(TURI.SCHEME_HTTPS, True);
     if not Result then
-      Result := AURL.StartsWith('http://', True);
+      Result := AURL.StartsWith(TURI.SCHEME_HTTP, True);
   end;
 
   function IsStoredLocal(const AURL: string): boolean;
@@ -163,28 +163,35 @@ procedure TImageWithUrlManager.SubThreadExecute(AValue: IImageWithURL);
 
 begin
   LImage := AValue;
-
   LUrl := LImage.ImageURL; // Saved local url
   LFinalImage := nil;
 
   try
     try
-      if EnableLoadFromCache and Assigned(CacheManager)
+      if EnableLoadFromCache
+      and Assigned(CacheManager)
       and CacheManager.IsCached(LUrl) then begin
+
         // Have copy on cache
         CacheManager.LoadFromCache(LUrl, LImage.BitmapIWU);
         LImageLoaded := True;
+
       end else if IsStoredLocal(LUrl) then begin
+
         // Url is file path and file exists
         if SyncBitmapLoadFromFile then begin
-          TThread.Synchronize(TThread.Current, procedure begin
+
+          TThread.Synchronize(TThread.Current, procedure
+          begin
             if Self.LoadThumbnailFromFile then
               LImage.BitmapIWU.LoadThumbnailFromFile(LUrl, ThumbSize.Width, ThumbSize.Height) // ISSUE (FormOnCreate, FormOnShow)
             else
               LImage.BitmapIWU.LoadFromFile(LUrl);  // ISSUE (FormOnCreate, FormOnShow)
             LImageLoaded := True;
           end);
+
         end else begin // Usign buffer bitmap
+
           LBufBmp := TBitmap.Create;
           try
             {$IFDEF YDW_DEBUG} try {$ENDIF}
@@ -193,23 +200,26 @@ procedure TImageWithUrlManager.SubThreadExecute(AValue: IImageWithURL);
             else
               LBufBmp.LoadFromFile(LUrl);  // ISSUE (FormOnCreate, FormOnShow)
 
-            TThread.Synchronize(nil,
+            TThread.Synchronize(TThread.Current,
             procedure
             begin
               LImage.BitmapIWU.Assign(LBufBmp);
               LImageLoaded := True;
             end);
+
             {$IFDEF YDW_DEBUG}
             Except
               on E: Exception do begin
                 Log('IsStoredLocal async load', E);
-                Raise E;
+                raise;
               end;
             end;
             {$ENDIF}
+
           finally
             LBufBmp.Free;
           end;
+
         end;
 
       end else begin
@@ -228,19 +238,18 @@ procedure TImageWithUrlManager.SubThreadExecute(AValue: IImageWithURL);
           end;
 
           LClient.SynchronizeEvents := False;
-          LClient.Asynchronous := false;
+          LClient.Asynchronous := False;
           LClient.AutomaticDecompression := [THTTPCompressionMethod.Any];
 
           if TThread.Current.CheckTerminated then exit;
-
           LResponse := LClient.Get(LUrl);
           if TThread.Current.CheckTerminated then exit;
 
           if not AllowThisResponse(LUrl, LResponse) then exit;
 
-          Self.EncodeImage(LResponse.ContentStream, LFinalImage);
+          EncodeImage(LResponse.ContentStream, LFinalImage);
 
-          if Self.EnableSaveToCache and Assigned(CacheManager) then begin
+          if EnableSaveToCache and Assigned(CacheManager) then begin
             if not CacheManager.IsCached(LUrl) then
               CacheManager.CacheItem(LUrl, LFinalImage);
           end;
@@ -254,7 +263,8 @@ procedure TImageWithUrlManager.SubThreadExecute(AValue: IImageWithURL);
 
         finally
 
-          if Assigned(LResponse) and (LFinalImage <> LResponse.ContentStream) then
+          if Assigned(LResponse)
+          and (LFinalImage <> LResponse.ContentStream) then
             FreeAndNil(LFinalImage);
 
           LClient.Free;
@@ -267,10 +277,11 @@ procedure TImageWithUrlManager.SubThreadExecute(AValue: IImageWithURL);
       On E: Exception do
         DoOnException(E);
     end;
+
   finally
 
     if Assigned(LImage.OnLoadingFinished) then begin
-      TThread.Synchronize(nil,
+      TThread.Synchronize(TThread.Current,
       procedure
       begin
         LImage.OnLoadingFinished(LImage as TObject, LImageLoaded);
diff --git a/source/YDW.Threading.pas b/source/YDW.Threading.pas
index 88cab07..b4ea124 100644
--- a/source/YDW.Threading.pas
+++ b/source/YDW.Threading.pas
@@ -45,14 +45,14 @@   TYdwReusableThread = class(TObject)
           Value: T;
           procedure Execute; override;
       End;
-      TThreadAndValue<T> = record
+      TThreadAndValue<T> = Class(TObject)
         public
           Thread: TSubWorkerThread;
           Value: T;
           constructor Create(AValue: T);
       end;
       { ❤-------------- }
-      TThreadAndValueList = TList<TThreadAndValue<T>>;
+      TThreadAndValueList = TObjectList<TThreadAndValue<T>>;
     protected
     { ❤ -- Thread safe --- }
       procedure SetThreadsCount(const value: integer);
@@ -63,14 +63,16 @@       TThreadAndValue<T> = record
       function IsRunning(AValue: T): boolean;
       function WaitForItem(AValue: T): LongWord;
       function OnWaitList(AThread: TSubWorkerThread): boolean;
+      function AutoRestartCondition: boolean; virtual;
     protected
       FThreadsCount: integer;
       FQueue: TList<T>;
       FRunning: TThreadAndValueList;
       FWaitList: TThreadList;
+//      FGarbage: TObjectList<TThread>;
+//      procedure ClearGarbage; { FIXME: Anal Violation sometimes. }
       function NewSubThread(AValue: T): TSubWorkerThread;
       function QueueCondition: boolean; virtual;
-      function AutoRestartCondition: boolean; virtual;
       procedure OnSubThreadFinish; virtual;
       function GetThreadByItem(AValue: T): TSubWorkerThread;
       function RunningIndex(AValue: T): integer; virtual; abstract; { dont forget this ! }
@@ -99,95 +101,104 @@ implementation
 
 function TGenericYDWQueuedThread<T>.AutoRestartCondition: boolean;
 begin
-  Result := ( Self.QueueCondition ) and
-            ( not TThread.Current.CheckTerminated);
+  FLock.BeginRead;
+  try
+    Result := ( Self.QueueCondition ) and
+              ( not TThread.Current.CheckTerminated);
+  finally
+    FLock.EndRead;
+  end;
 end;
 
 procedure TGenericYDWQueuedThread<T>.Execute;
 const
-  MICRO_SLEEP_TIME = 10;
+  MICRO_SLEEP_TIME = 2;
 var
   I: integer;
   LNewThread: TSubWorkerThread;
   LItem: TThreadAndValue<T>;
 begin
-  try
-    repeat
-      try
+  repeat
+    try
+      while ( TRUE ) do begin
 
-        while ( TRUE ) do begin
+        if TThread.Current.CheckTerminated then exit;
 
+        While ( RunningCount >= Self.ThreadsCount ) do begin
           if TThread.Current.CheckTerminated then exit;
+          Sleep(MICRO_SLEEP_TIME);
+        end;
 
-          While ( RunningCount >= Self.ThreadsCount ) do begin
-            if TThread.Current.CheckTerminated then exit;
-            Sleep(MICRO_SLEEP_TIME);
-          end;
+        FLock.BeginWrite;
+        try
+          if QueueCondition then begin
 
-          FLock.BeginWrite();
-          try
-            if ( Self.QueueCondition ) then begin
+            LItem := TThreadAndValue<T>.Create(FQueue.First); { get next Value from queue }
+            LNewThread := NewSubThread(LItem.Value);
+            LItem.Thread := LNewThread;
+            FRunning.Add(LItem);
+            FQueue.Delete(0);
+            LNewThread.Start;
 
-              LItem := TThreadAndValue<T>.Create(FQueue.First); { get next Value from queue }
-              LNewThread := NewSubThread(LItem.Value);
-              LItem.Thread := LNewThread;
-              FRunning.Add(LItem);
-              FQueue.Delete(0);
-              LNewThread.Start;
+            while not LNewThread.Started do
+              Sleep(1);
 
-              while not LNewThread.Started do
-                Sleep(1);
+            LNewThread := Nil;
+            LItem := Nil;
 
-            end;
-          finally
-            FLock.EndWrite();
           end;
-
-          if ( RunningCount = 0 ) then break;
-
+        finally
+          FLock.EndWrite;
         end;
 
-      finally
+        if (not AutoRestartCondition) 
+          and (RunningCount = 0) then break;
 
-        { Terminate all threads }
-        FLock.BeginWrite();
-        try
+      end;
 
-          for I := 0 to FRunning.count - 1 do begin
-            var LThread := FRunning[I].Thread;
+    finally
 
-            LThread.Terminate;
+      { Terminate all threads }
+      FLock.BeginWrite;
+      try
+        for I := 0 to FRunning.count - 1 do
+          FRunning[I].Thread.Terminate;
+      finally
+        FLock.EndWrite;
+      end;
 
-          end;
+      { Waiting for finish }
+      while (RunningCount > 0) do begin
+        sleep(MICRO_SLEEP_TIME);
+      end;
 
-        finally
-          FLock.EndWrite();
-        end;
+      var LListEmpty: boolean := False;
+      while (not LListEmpty) do begin
+        var LWaitList := FWaitList.LockList;
+        try
+          LListEmpty := (LWaitList.Count = 0);
+
+//          FLock.BeginWrite;
+//          try
+//            {$IFDEF YDW_DEBUG} try {$ENDIF}
+//              if LListEmpty then ClearGarbage; { Free used threads }
+//            {$IFDEF YDW_DEBUG} except
+//              On E: Exception do begin
+//                YDW.Debug.Log('TGenericYDWQueuedThread<T>.Execute ClearGarbage', E);
+//                raise;
+//              end;
+//            end; {$ENDIF}
+//          finally
+//            FLock.EndWrite;
+//          end;
 
-        { Waiting for finish }
-        while (RunningCount > 0) do begin
-          sleep(MICRO_SLEEP_TIME);
-        end;
-        
-        var LListEmpty: boolean := False;
-        while (not LListEmpty) do begin
-          var LWaitList := FWaitList.LockList;
-          try
-            LListEmpty := (LWaitList.Count = 0) 
-          finally
-            FWaitList.UnlockList;
-          end;
+        finally
+          FWaitList.UnlockList;
         end;
-        
       end;
-    until not AutoRestartCondition;
-  except
-
-    on E: Exception do begin
-      Raise E;
+        
     end;
-
-  end;
+  until not AutoRestartCondition;
 end;
 
 function TGenericYDWQueuedThread<T>.GetThreadByItem(
@@ -229,9 +240,12 @@ function TGenericYDWQueuedThread<T>.NewSubThread(AValue: T): TSubWorkerThread;
 
 function TGenericYDWQueuedThread<T>.RunningCount: integer;
 begin
-  FLock.BeginRead();
-  Result := Self.FRunning.Count;
-  FLock.EndRead();
+  FLock.BeginRead;
+  try
+    Result := Self.FRunning.Count;
+  finally
+    FLock.EndRead;
+  end; 
 end;
 
 procedure TGenericYDWQueuedThread<T>.SetThreadsCount(const Value: integer);
@@ -248,7 +262,6 @@ procedure TGenericYDWQueuedThread<T>.SetThreadsCount(const Value: integer);
 function TGenericYDWQueuedThread<T>.WaitForItem(AValue: T): LongWord;
 var
   LThread: TSubWorkerThread;
-  LIndex: integer;
 begin
   {$IFDEF YDW_DEBUG} try {$ENDIF}
     FLock.BeginRead;
@@ -260,14 +273,14 @@ function TGenericYDWQueuedThread<T>.WaitForItem(AValue: T): LongWord;
       FLock.EndRead;
     end;
 
-    if Assigned(LThread) then
+    if Assigned(LThread) then begin
       Result := LThread.WaitFor;
-
-    FWaitList.Remove(LThread);
+      FWaitList.Remove(LThread);
+    end;
   {$IFDEF YDW_DEBUG} except
     On E: Exception do begin
       YDW.Debug.Log('TGenericYDWQueuedThread<T>.WaitForItem', E);
-      raise E;
+      raise;
     end;
   end; {$ENDIF}
 end;
@@ -321,7 +334,7 @@ procedure TYdwReusableThread.Terminate;
   {$IFDEF YDW_DEBUG} except
     On E: Exception do begin
       YDW.Debug.Log('TYdwReusableThread.Terminate', E);
-      Raise E;
+      raise;
     end;
   end; {$ENDIF}
 end;
@@ -336,7 +349,7 @@ function TYdwReusableThread.UnlockedIsRunning: boolean;
   {$IFDEF YDW_DEBUG} except
     On E: Exception do begin
       YDW.Debug.Log('TYdwReusableThread.UnlockedIsRunning', E);
-      Raise E;
+      raise;
     end;
   end; {$ENDIF}
 end;
@@ -361,7 +374,7 @@ function TYdwReusableThread.WaitFor: LongWord;
   {$IFDEF YDW_DEBUG} except
     On E: exception do begin
       YDW.Debug.Log('TYdwReusableThread.WaitForFinish ' + FThread.ThreadID.ToString, E);
-      Raise E;
+      raise;
     end;
   end; {$ENDIF}
 end;
@@ -383,25 +396,27 @@ procedure TGenericYDWQueuedThread<T>.AbortItem(AItem: T);
   FLock.BeginWrite();
   try
     Index := Self.RunningIndex(AItem);
-    if ( Index <> -1 ) then begin
-      try
-        FRunning[Index].Thread.Terminate;
-      except
-        On E: exception do
-          raise E;
-      end;
-    end;
+    if ( Index <> -1 ) then
+      FRunning[Index].Thread.Terminate;
 
     Index := FQueue.IndexOf(AItem);
-    if ( Index <> -1 ) then begin
+    if ( Index <> -1 ) then
       FQueue.Delete(Index);
-    end;
-
   finally
     FLock.EndWrite();
   end;
 end;
 
+//procedure TGenericYDWQueuedThread<T>.ClearGarbage;
+//begin
+//  try
+//    FGarbage.Clear;
+//  except
+//    On E: Exception do
+//      Log('TGenericYDWQueuedThread<T>.ClearGarbage FGarbage.Clear', E);
+//  end;
+//end;
+
 constructor TGenericYDWQueuedThread<T>.Create;
 begin
   inherited;
@@ -410,6 +425,7 @@ constructor TGenericYDWQueuedThread<T>.Create;
   FThreadsCount := DEFAULT_THREADS_COUNT;
   FWaitList := TThreadList.Create;
   FWaitList.Duplicates := dupAccept;
+//  FGarbage := TObjectList<TThread>.Create;
 end;
 
 destructor TGenericYDWQueuedThread<T>.Destroy;
@@ -418,6 +434,16 @@ destructor TGenericYDWQueuedThread<T>.Destroy;
   FQueue.Free;
   FRunning.Free;
   FWaitList.Free;
+
+//  {$IFDEF YDW_DEBUG} try {$ENDIF}
+//    Self.ClearGarbage;
+//    FGarbage.Free;
+//  {$IFDEF YDW_DEBUG} except
+//    On E: exception do begin
+//      YDW.Debug.Log('TGenericYDWQueuedThread<T>.Destroy ClearGarbage: ' + LStr, E);
+//      raise;
+//    end;
+//  end; {$ENDIF}
 end;
 
 procedure TGenericYDWQueuedThread<T>.OnSubThreadFinish;
@@ -477,7 +503,7 @@ function TGenericYDWQueuedThreadInterface<T>.RunningIndex(AValue: T): integer;
   I: integer;
 begin
   for I := 0 to FRunning.Count - 1 do begin
-    if ((AValue as TObject) = (FRunning[I].value as TObject )) then
+    if ((AValue as TObject) = (FRunning[I].value as TObject)) then
     begin
       Result := I;
       exit;
@@ -492,13 +518,11 @@ procedure TYdwReusableThread.TWorkerThread.Execute;
 begin
   Owner.Execute;
 end;
-
-{ TGenericYDWQueuedThread<T>.TSubWorkerThread }
-
+

 procedure TGenericYDWQueuedThread<T>.TSubWorkerThread.Execute;
 var
-  I, ThreadIndex, LastIndex: integer;
-  TempItem: TThreadAndValue<T>;
+  I: integer;
+  ThreadIndex: integer;
 begin
   try
     Owner.SubThreadExecute(Value);
@@ -506,9 +530,8 @@ procedure TGenericYDWQueuedThread<T>.TSubWorkerThread.Execute;
   finally
     Owner.FLock.BeginWrite();
     try
-      LastIndex := Owner.FRunning.Count - 1;
 
-      for I := 0 to LastIndex do begin
+      for I := 0 to Owner.FRunning.Count - 1 do begin
         if ( Owner.FRunning[I].Thread = TThread.Current ) then
         begin
           ThreadIndex := I;
@@ -516,12 +539,8 @@ procedure TGenericYDWQueuedThread<T>.TSubWorkerThread.Execute;
         end;
       end;
 
-      if ( ThreadIndex <> LastIndex ) and ( Owner.FRunning.Count > 1 ) then
-      begin
-        Owner.FRunning.Exchange(LastIndex, ThreadIndex);
-      end;
-
-      Owner.FRunning.Delete(LastIndex);
+      Owner.FRunning.Delete(ThreadIndex);
+//      Owner.FGarbage.Add(TThread.Current);
 
     finally
       Owner.FLock.EndWrite();
diff --git a/tests/IWU/IWUTest.fmx b/tests/IWU/IWUTest.fmx
index cbe3e3d..1acfe9b 100644
--- a/tests/IWU/IWUTest.fmx
+++ b/tests/IWU/IWUTest.fmx
@@ -16,7 +16,7 @@ object Form2: TForm2
     Size.Height = 467.000000000000000000
     Size.PlatformDefault = False
     TabHeight = 25.000000000000000000
-    TabIndex = 4
+    TabIndex = 2
     TabOrder = 0
     TabPosition = PlatformDefault
     Sizes = (
@@ -338,7 +338,7 @@ object Form2: TForm2
       CustomIcon = <
         item
         end>
-      IsSelected = False
+      IsSelected = True
       Size.Width = 84.000000000000000000
       Size.Height = 25.000000000000000000
       Size.PlatformDefault = False
@@ -494,7 +494,7 @@ object Form2: TForm2
       CustomIcon = <
         item
         end>
-      IsSelected = True
+      IsSelected = False
       Size.Width = 51.000000000000000000
       Size.Height = 25.000000000000000000
       Size.PlatformDefault = False
diff --git a/tests/IWU/IWUTest.pas b/tests/IWU/IWUTest.pas
index 1541292..5bd179f 100644
--- a/tests/IWU/IWUTest.pas
+++ b/tests/IWU/IWUTest.pas
@@ -410,8 +410,30 @@ procedure TForm2.FormCreate(Sender: TObject);
 end;
 
 procedure TForm2.FormDestroy(Sender: TObject);
+var
+  I: integer;
+
+  procedure NilManager(AObject: TComponent);
+  var
+    I: integer;
+    LIWU: IImageWithURL;
+  begin
+    if Supports(AObject, IImageWithURL, LIWU) then
+      LIWU.ImageManager := Nil;
+
+    for I := 0 to AObject.ComponentCount - 1 do
+    begin
+      NilManager(AObject.Components[I])
+    end;
+  end;
+
 begin
-  ImgManager.Free;
+  for I := 0 to Images.Count - 1 do
+    images[I].ImageManager := Nil;
+
+  nilManager(Self);
+
+  FreeAndNil(ImgManager);
 end;
 
 function TForm2.GetThreadsCount: integer;
diff --git a/tests/IWU/IWUTestApp.dproj b/tests/IWU/IWUTestApp.dproj
index 0007607..a816f9b 100644
--- a/tests/IWU/IWUTestApp.dproj
+++ b/tests/IWU/IWUTestApp.dproj
@@ -5,7 +5,7 @@
         <FrameworkType>FMX</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>32787</TargetedPlatforms>
         <AppType>Application</AppType>
         <MainSource>IWUTestApp.dpr</MainSource>
@@ -38,6 +38,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
+        <Cfg_1_Android64>true</Cfg_1_Android64>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
         <Cfg_1_Win32>true</Cfg_1_Win32>
         <CfgParent>Cfg_1</CfgParent>
@@ -55,6 +61,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
+        <Cfg_2_Android64>true</Cfg_2_Android64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -164,14 +176,25 @@
         <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
         <DCC_RangeChecking>true</DCC_RangeChecking>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
+        <DCC_Define>YDW_DEBUG;$(DCC_Define)</DCC_Define>
+        <VerInfo_Build>1</VerInfo_Build>
+        <Android_NotificationAccentColor>#000000</Android_NotificationAccentColor>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <DCC_Define>YDW_DEBUG;$(DCC_Define)</DCC_Define>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <DCC_Define>YDW_DEBUG;$(DCC_Define)</DCC_Define>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -179,6 +202,11 @@
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
         <DCC_DebugInformation>0</DCC_DebugInformation>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
+        <DCC_Define>YDW_DEBUG;$(DCC_Define)</DCC_Define>
+        <VerInfo_Build>1</VerInfo_Build>
+        <Android_NotificationAccentColor>#000000</Android_NotificationAccentColor>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -189,6 +217,9 @@
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <DCC_Define>YDW_DEBUG;$(DCC_Define)</DCC_Define>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -234,111 +265,93 @@
                 </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="3">
-                <DeployFile LocalName="Win32\Debug\IWUTestApp.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>IWUTestApp.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile LocalName="Win32\Release\IWUTestApp.exe" Configuration="Release" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>IWUTestApp.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployFile LocalName="Android64\Release\strings.xml" Configuration="Release" Class="Android_Strings">
                     <Platform Name="Android64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\lib\android\debug\armeabi-v7a\libnative-activity.so" Configuration="Release" Class="AndroidLibnativeArmeabiv7aFile">
-                    <Platform Name="Android64">
-                        <RemoteName>libIWUTestApp.so</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile LocalName="Android64\Release\styles-v21.xml" Configuration="Release" Class="AndroidSplashStylesV21">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Release" Class="Android_LauncherIcon72">
                     <Platform Name="Android64">
-                        <RemoteName>styles.xml</RemoteName>
+                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Release" Class="Android_NotificationIcon24">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Debug" Class="Android_LauncherIcon72">
                     <Platform Name="Android64">
-                        <RemoteName>ic_notification.png</RemoteName>
+                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Release" Class="Android_LauncherIcon36">
+                <DeployFile LocalName="Android64\Release\colors.xml" Configuration="Release" Class="Android_Colors">
                     <Platform Name="Android64">
-                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png" Configuration="Release" Class="Android_LauncherIcon72">
+                <DeployFile LocalName="Android64\Debug\AndroidManifest.xml" Configuration="Debug" Class="ProjectAndroidManifest">
                     <Platform Name="Android64">
-                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Configuration="Release" Class="Android_SplashImage960">
+                <DeployFile LocalName="Android64\Release\splash_image_def.xml" Configuration="Release" Class="AndroidSplashImageDef">
                     <Platform Name="Android64">
-                        <RemoteName>splash_image.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Android64\Release\colors.xml" Configuration="Release" Class="Android_Colors">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Configuration="Release" Class="Android_LauncherIcon48">
                     <Platform Name="Android64">
+                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Android64\Release\splash_image_def.xml" Configuration="Release" Class="AndroidSplashImageDef">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Configuration="Release" Class="Android_LauncherIcon144">
                     <Platform Name="Android64">
+                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Android64\Release\IWUTestApp.classes" Configuration="Release" Class="AndroidClasses">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png" Configuration="Release" Class="Android_LauncherIcon192">
                     <Platform Name="Android64">
-                        <Operation>64</Operation>
+                        <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Configuration="Release" Class="Android_LauncherIcon48">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png" Configuration="Debug" Class="Android_LauncherIcon48">
                     <Platform Name="Android64">
                         <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Configuration="Release" Class="Android_LauncherIcon144">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png" Configuration="Debug" Class="Android_LauncherIcon144">
                     <Platform Name="Android64">
                         <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png" Configuration="Release" Class="Android_LauncherIcon192">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png" Configuration="Debug" Class="Android_LauncherIcon192">
                     <Platform Name="Android64">
                         <RemoteName>ic_launcher.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png" Configuration="Release" Class="Android_NotificationIcon48">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png" Configuration="Release" Class="Android_NotificationIcon48">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png" Configuration="Debug" Class="Android_NotificationIcon48">
                     <Platform Name="Android64">
                         <RemoteName>ic_notification.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Release" Class="Android_SplashImage426">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Release" Class="Android_SplashImage640">
                     <Platform Name="Android64">
                         <RemoteName>splash_image.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Release" Class="Android_SplashImage640">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Debug" Class="Android_SplashImage640">
                     <Platform Name="Android64">
                         <RemoteName>splash_image.png</RemoteName>
                         <Overwrite>true</Overwrite>
@@ -350,14 +363,14 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
-                    <Platform Name="iOSSimulator">
+                <DeployFile LocalName="$(BDS)\lib\android\debug\armeabi\libnative-activity.so" Configuration="Debug" Class="AndroidLibnativeArmeabiFile">
+                    <Platform Name="Android64">
+                        <RemoteName>libIWUTestApp.so</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Android64\Release\libIWUTestApp.so" Configuration="Release" Class="ProjectOutput">
+                <DeployFile LocalName="Android64\Debug\colors.xml" Configuration="Debug" Class="Android_Colors">
                     <Platform Name="Android64">
-                        <RemoteName>libIWUTestApp.so</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
@@ -372,13 +385,30 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Release" Class="Android_NotificationIcon72">
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png" Configuration="Release" Class="Android_NotificationIcon96">
                     <Platform Name="Android64">
                         <RemoteName>ic_notification.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png" Configuration="Release" Class="Android_NotificationIcon96">
+                <DeployFile LocalName="Android64\Debug\splash_image_def.xml" Configuration="Debug" Class="AndroidSplashImageDef">
+                    <Platform Name="Android64">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Debug\IWUTestApp.classes" Configuration="Debug" Class="AndroidClasses">
+                    <Platform Name="Android64">
+                        <Operation>64</Operation>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_36x36.png" Configuration="Debug" Class="Android_NotificationIcon36">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png" Configuration="Debug" Class="Android_NotificationIcon96">
                     <Platform Name="Android64">
                         <RemoteName>ic_notification.png</RemoteName>
                         <Overwrite>true</Overwrite>
@@ -406,12 +436,164 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="$(BDS)\lib\android\debug\mips\libnative-activity.so" Configuration="Debug" Class="AndroidLibnativeMipsFile">
+                    <Platform Name="Android64">
+                        <RemoteName>libIWUTestApp.so</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png" Configuration="Debug" Class="Android_LauncherIcon96">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_launcher.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Win32\Debug\IWUTestApp.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>IWUTestApp.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Win32\Release\IWUTestApp.exe" Configuration="Release" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>IWUTestApp.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\lib\android\debug\armeabi-v7a\libnative-activity.so" Configuration="Release" Class="AndroidLibnativeArmeabiv7aFile">
+                    <Platform Name="Android64">
+                        <RemoteName>libIWUTestApp.so</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\lib\android\debug\armeabi-v7a\libnative-activity.so" Configuration="Debug" Class="AndroidLibnativeArmeabiv7aFile">
+                    <Platform Name="Android64">
+                        <RemoteName>libIWUTestApp.so</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Release\styles-v21.xml" Configuration="Release" Class="AndroidSplashStylesV21">
+                    <Platform Name="Android64">
+                        <RemoteName>styles.xml</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Release" Class="Android_NotificationIcon24">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Release" Class="Android_LauncherIcon36">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_launcher.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Configuration="Release" Class="Android_SplashImage960">
+                    <Platform Name="Android64">
+                        <RemoteName>splash_image.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png" Configuration="Debug" Class="Android_LauncherIcon36">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_launcher.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png" Configuration="Debug" Class="Android_SplashImage960">
+                    <Platform Name="Android64">
+                        <RemoteName>splash_image.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Debug\libIWUTestApp.so" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Android64">
+                        <RemoteName>libIWUTestApp.so</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png" Configuration="Debug" Class="Android_NotificationIcon24">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Release\IWUTestApp.classes" Configuration="Release" Class="AndroidClasses">
+                    <Platform Name="Android64">
+                        <Operation>64</Operation>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
+                    <Platform Name="OSX32">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Debug\styles.xml" Configuration="Debug" Class="AndroidSplashStyles">
+                    <Platform Name="Android64">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Release" Class="Android_SplashImage426">
+                    <Platform Name="Android64">
+                        <RemoteName>splash_image.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png" Configuration="Debug" Class="Android_SplashImage426">
+                    <Platform Name="Android64">
+                        <RemoteName>splash_image.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                    <Platform Name="iOSSimulator">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Debug\strings.xml" Configuration="Debug" Class="Android_Strings">
+                    <Platform Name="Android64">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Debug\styles-v21.xml" Configuration="Debug" Class="AndroidSplashStylesV21">
+                    <Platform Name="Android64">
+                        <RemoteName>styles.xml</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="Android64\Release\libIWUTestApp.so" Configuration="Release" Class="ProjectOutput">
+                    <Platform Name="Android64">
+                        <RemoteName>libIWUTestApp.so</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Release" Class="Android_NotificationIcon72">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png" Configuration="Debug" Class="Android_NotificationIcon72">
+                    <Platform Name="Android64">
+                        <RemoteName>ic_notification.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Configuration="Release" Class="Android_SplashImage470">
                     <Platform Name="Android64">
                         <RemoteName>splash_image.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png" Configuration="Debug" Class="Android_SplashImage470">
+                    <Platform Name="Android64">
+                        <RemoteName>splash_image.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -1213,10 +1395,10 @@
                 </DeployClass>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>