diff --git a/fpcupdeluxe.lps b/fpcupdeluxe.lps
index 7288441c..2a3ba728 100644
--- a/fpcupdeluxe.lps
+++ b/fpcupdeluxe.lps
@@ -4,16 +4,18 @@
     <PathDelim Value="\"/>
     <Version Value="12"/>
     <ManyBuildModesSelection Value="win32,win64,linuxi386,linuxi386QT5,linuxi386QT5zip,linux64,linuxaarch64,linuxaarch64QT5,linuxaarch64QT5zip,linuxarm,linuxarmQT5,linuxarmQT5zip,linuxarmv6,linuxx64QT5,linuxx64QT5zip,linuxppc64,freebsdi386,freebsdx64,solarisx64,dragonflyx64,netbsdx64,netbsdi386,freebsdx64QT5,freebsdx64QT5zip"/>
-    <BuildModes Active="openbsdx64"/>
-    <Units Count="662">
+    <BuildModes Active="Default"/>
+    <Units Count="665">
       <Unit0>
         <Filename Value="up.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="fpcupdeluxe"/>
-        <EditorIndex Value="-1"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
         <TopLine Value="187"/>
-        <CursorPos Y="215"/>
+        <CursorPos Y="214"/>
         <UsageCount Value="200"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
@@ -21,11 +23,11 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="4194"/>
-        <CursorPos X="80" Y="4208"/>
+        <TopLine Value="316"/>
+        <CursorPos X="82" Y="340"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="sources\updeluxe\extrasettings.pas"/>
@@ -75,6 +77,8 @@
         <Filename Value="sources\fpcup.ini"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
+        <TopLine Value="419"/>
+        <CursorPos X="45" Y="441"/>
         <UsageCount Value="200"/>
         <DefaultSyntaxHighlighter Value="Ini"/>
       </Unit7>
@@ -124,9 +128,9 @@
       <Unit13>
         <Filename Value="sources\fpcuputil.pas"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="652"/>
-        <CursorPos X="75" Y="665"/>
-        <UsageCount Value="53"/>
+        <TopLine Value="2814"/>
+        <CursorPos X="61" Y="2822"/>
+        <UsageCount Value="54"/>
       </Unit13>
       <Unit14>
         <Filename Value="..\..\stable\fpcsrc\packages\rtl-objpas\src\inc\strutils.pp"/>
@@ -243,8 +247,8 @@
         <Filename Value="sources\installerlazarus.pas"/>
         <UnitName Value="installerLazarus"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="2506"/>
-        <CursorPos X="35" Y="2522"/>
+        <TopLine Value="2711"/>
+        <CursorPos Y="2736"/>
         <UsageCount Value="23"/>
       </Unit29>
       <Unit30>
@@ -535,9 +539,9 @@
       <Unit69>
         <Filename Value="sources\gitclient.pas"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="315"/>
-        <CursorPos X="44" Y="321"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="436"/>
+        <CursorPos X="27" Y="455"/>
+        <UsageCount Value="11"/>
       </Unit69>
       <Unit70>
         <Filename Value="..\..\stabletest\fpcsrc\rtl\linux\x86_64\si_c.inc"/>
@@ -4950,11 +4954,44 @@
         <UsageCount Value="10"/>
         <DefaultSyntaxHighlighter Value="C++"/>
       </Unit661>
+      <Unit662>
+        <Filename Value="sources\repoclient.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="128"/>
+        <CursorPos X="24" Y="141"/>
+        <UsageCount Value="11"/>
+      </Unit662>
+      <Unit663>
+        <Filename Value="C:\fpcupsystems\stable324\fpcsrc\rtl\inc\wstringh.inc"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos X="10" Y="24"/>
+        <UsageCount Value="10"/>
+      </Unit663>
+      <Unit664>
+        <Filename Value="C:\fpcupsystems\stable324\fpcsrc\packages\rtl-objpas\src\inc\strutils.pp"/>
+        <UnitName Value="StrUtils"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="35"/>
+        <CursorPos X="25" Y="48"/>
+        <UsageCount Value="10"/>
+      </Unit664>
     </Units>
     <Debugger>
       <Backend Value="{A76EFAFB-3A42-421F-9672-C141897C94AA}"/>
     </Debugger>
-    <JumpHistory HistoryIndex="-1"/>
+    <JumpHistory Count="3" HistoryIndex="2">
+      <Position1>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="4204" Column="46" TopLine="4194"/>
+      </Position1>
+      <Position2>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+      </Position2>
+      <Position3>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="340" Column="82" TopLine="316"/>
+      </Position3>
+    </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>
       <Modes ActiveMode="default"/>
diff --git a/fpcupdeluxetrunk.lps b/fpcupdeluxetrunk.lps
index 98e01963..40f5f4ec 100644
--- a/fpcupdeluxetrunk.lps
+++ b/fpcupdeluxetrunk.lps
@@ -4,7 +4,6 @@
     <PathDelim Value="\"/>
     <Version Value="12"/>
     <ManyBuildModesSelection Value="linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,linuxx64QT6,linuxx64QT6zip,freebsdx64"/>
-    <BuildModes Active="linuxx64QT6"/>
     <Units Count="102">
       <Unit0>
         <Filename Value="up.lpr"/>
@@ -13,7 +12,7 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="33"/>
         <CursorPos Y="38"/>
-        <UsageCount Value="65"/>
+        <UsageCount Value="66"/>
       </Unit0>
       <Unit1>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
@@ -21,9 +20,10 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <TopLine Value="4540"/>
-        <CursorPos X="59" Y="4553"/>
-        <UsageCount Value="65"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="1910"/>
+        <CursorPos X="28" Y="1916"/>
+        <UsageCount Value="66"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -35,13 +35,13 @@
         <ResourceBaseClass Value="Form"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="26" Y="12"/>
-        <UsageCount Value="65"/>
+        <UsageCount Value="66"/>
       </Unit2>
       <Unit3>
         <Filename Value="sources\updeluxe\syneditpopup.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SynEditPopup"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
       </Unit3>
       <Unit4>
         <Filename Value="sources\updeluxe\aboutfrm.pas"/>
@@ -50,7 +50,7 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="AboutFrm"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
       </Unit4>
       <Unit5>
         <Filename Value="sources\updeluxe\infounit.pas"/>
@@ -58,7 +58,7 @@
         <ComponentName Value="InfoForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
       </Unit5>
       <Unit6>
         <Filename Value="sources\updeluxe\modulesettings.pas"/>
@@ -66,29 +66,33 @@
         <ComponentName Value="Form3"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
       </Unit6>
       <Unit7>
         <Filename Value="sources\fpcup.ini"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="39"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos X="23" Y="22"/>
+        <UsageCount Value="40"/>
         <DefaultSyntaxHighlighter Value="Ini"/>
       </Unit7>
       <Unit8>
         <Filename Value="sources\settings.ini"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
         <DefaultSyntaxHighlighter Value="Ini"/>
       </Unit8>
       <Unit9>
         <Filename Value="sources\revision.inc"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="39"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="4"/>
+        <UsageCount Value="40"/>
       </Unit9>
       <Unit10>
         <Filename Value="sources\processutils.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
       </Unit10>
       <Unit11>
         <Filename Value="sources\updeluxe\subarch.pas"/>
@@ -96,17 +100,15 @@
         <ComponentName Value="SubarchForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UsageCount Value="39"/>
+        <UsageCount Value="40"/>
       </Unit11>
       <Unit12>
         <Filename Value="sources\installerlazarus.pas"/>
         <UnitName Value="installerLazarus"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="7"/>
-        <TopLine Value="2724"/>
-        <CursorPos X="25" Y="2696"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="2752"/>
+        <CursorPos X="61" Y="2671"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit12>
       <Unit13>
         <Filename Value="sources\repoclient.pas"/>
@@ -118,11 +120,10 @@
       <Unit14>
         <Filename Value="sources\installercore.pas"/>
         <UnitName Value="installerCore"/>
-        <EditorIndex Value="5"/>
-        <TopLine Value="177"/>
-        <CursorPos X="3" Y="190"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="46"/>
+        <CursorPos X="3" Y="59"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit14>
       <Unit15>
         <Filename Value="sources\gitclient.pas"/>
@@ -134,11 +135,10 @@
       <Unit16>
         <Filename Value="sources\installeruniversal.pas"/>
         <UnitName Value="installerUniversal"/>
-        <EditorIndex Value="6"/>
-        <TopLine Value="316"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="315"/>
         <CursorPos X="21" Y="303"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit16>
       <Unit17>
         <Filename Value="sources\crossinstallers\m_any_to_linux_base.pas"/>
@@ -164,20 +164,18 @@
       <Unit20>
         <Filename Value="sources\installermanager.pas"/>
         <UnitName Value="installerManager"/>
-        <EditorIndex Value="2"/>
-        <TopLine Value="2282"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="2280"/>
         <CursorPos X="55" Y="2219"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit20>
       <Unit21>
         <Filename Value="sources\installerfpc.pas"/>
         <UnitName Value="installerFpc"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="4420"/>
         <CursorPos X="37" Y="4434"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit21>
       <Unit22>
         <Filename Value="sources\hgclient.pas"/>
@@ -685,11 +683,10 @@
       <Unit90>
         <Filename Value="sources\installerbase.pas"/>
         <UnitName Value="installerBase"/>
-        <EditorIndex Value="10"/>
-        <TopLine Value="455"/>
-        <CursorPos X="13" Y="458"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="439"/>
+        <CursorPos X="3" Y="441"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit90>
       <Unit91>
         <Filename Value="C:\fpcupsystems\trunk\lazarus\lcl\lclplatformdef.pas"/>
@@ -715,11 +712,10 @@
       </Unit93>
       <Unit94>
         <Filename Value="sources\m_crossinstaller.pas"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="646"/>
         <CursorPos Y="495"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit94>
       <Unit95>
         <Filename Value="C:\fpcupsystems\trunk\lazarus\components\opengl\glqtcontext.pas"/>
@@ -739,27 +735,24 @@
       </Unit96>
       <Unit97>
         <Filename Value="sources\updeluxe\readerstub\fpcupdeluxemainformreader.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="4474"/>
         <CursorPos X="10" Y="4490"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit97>
       <Unit98>
         <Filename Value="sources\fpcuputil.pas"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="3868"/>
         <CursorPos X="14" Y="3885"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit98>
       <Unit99>
         <Filename Value="sources\updatelazconfig.pas"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="325"/>
         <CursorPos X="35" Y="336"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit99>
       <Unit100>
         <Filename Value="C:\fpcupsystems\trunk\fpcsrc\rtl\objpas\classes\classesh.inc"/>
@@ -776,119 +769,42 @@
         <UsageCount Value="10"/>
       </Unit101>
     </Units>
-    <JumpHistory Count="28" HistoryIndex="27">
+    <JumpHistory Count="9" HistoryIndex="8">
       <Position1>
-        <Filename Value="sources\installerfpc.pas"/>
-        <Caret Line="4506" Column="41" TopLine="4484"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="4550" Column="29" TopLine="4537"/>
       </Position1>
       <Position2>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2722" Column="16" TopLine="2712"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="4551" Column="69" TopLine="4537"/>
       </Position2>
       <Position3>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2369" Column="8" TopLine="2356"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="4554" Column="18" TopLine="4536"/>
       </Position3>
       <Position4>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2724" Column="36" TopLine="2530"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="1979" Column="13" TopLine="1957"/>
       </Position4>
       <Position5>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2709" Column="26" TopLine="2703"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="5144" Column="29" TopLine="5130"/>
       </Position5>
       <Position6>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2735" Column="24" TopLine="2716"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
       </Position6>
       <Position7>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2368" Column="12" TopLine="2355"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="1981" Column="23" TopLine="1965"/>
       </Position7>
       <Position8>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2760" TopLine="2737"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="340" Column="66" TopLine="328"/>
       </Position8>
       <Position9>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2746" TopLine="2733"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="1916" Column="28" TopLine="1904"/>
       </Position9>
-      <Position10>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="672" TopLine="646"/>
-      </Position10>
-      <Position11>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2754" Column="33" TopLine="2740"/>
-      </Position11>
-      <Position12>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2732" Column="18" TopLine="2720"/>
-      </Position12>
-      <Position13>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2370" Column="3" TopLine="2357"/>
-      </Position13>
-      <Position14>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2755" TopLine="2735"/>
-      </Position14>
-      <Position15>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2717" Column="48" TopLine="2701"/>
-      </Position15>
-      <Position16>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2295" Column="14" TopLine="2284"/>
-      </Position16>
-      <Position17>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2722" Column="53" TopLine="2705"/>
-      </Position17>
-      <Position18>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2756" Column="99" TopLine="2748"/>
-      </Position18>
-      <Position19>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="651" TopLine="649"/>
-      </Position19>
-      <Position20>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="1814" Column="27" TopLine="1808"/>
-      </Position20>
-      <Position21>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2609" Column="53" TopLine="2596"/>
-      </Position21>
-      <Position22>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2635" Column="32" TopLine="2622"/>
-      </Position22>
-      <Position23>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2654" Column="35" TopLine="2641"/>
-      </Position23>
-      <Position24>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2672" Column="29" TopLine="2659"/>
-      </Position24>
-      <Position25>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2679" Column="29" TopLine="2659"/>
-      </Position25>
-      <Position26>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2732" Column="93" TopLine="2707"/>
-      </Position26>
-      <Position27>
-        <Filename Value="sources\installerlazarus.pas"/>
-        <Caret Line="2735" Column="23" TopLine="2722"/>
-      </Position27>
-      <Position28>
-        <Filename Value="sources\installeruniversal.pas"/>
-        <Caret Line="283" TopLine="268"/>
-      </Position28>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>
diff --git a/public/gitrevision.txt b/public/gitrevision.txt
index 0614b048..8767f645 100644
--- a/public/gitrevision.txt
+++ b/public/gitrevision.txt
@@ -1 +1 @@
-[master]darwin_amd64_crossbins_all-2916(23d86e6)
+[master]darwin_amd64_crossbins_all-2917(ea1e6a5)
diff --git a/sources/fpcup.ini b/sources/fpcup.ini
index 6e5c84dc..e173d039 100644
--- a/sources/fpcup.ini
+++ b/sources/fpcup.ini
@@ -19,7 +19,7 @@
 ; ... and you can define your own, like below:
 
 [fpcupinfo]
-inifileversion=4.0.0.1
+inifileversion=4.0.0.2
 
 [ALIASfpcURL]
 stable.git=https://github.com/LongDirtyAnimAlf/fpcsource_3_2_2.git
@@ -108,6 +108,7 @@ stable.gitlab=release_3_2_2
 
 [ALIASlazTAG]
 stable.gitlab=lazarus_3_6
+; 4.0.gitlab=lazarus_4_0
 3.6.gitlab=lazarus_3_6
 3.4.gitlab=lazarus_3_4
 3.2.gitlab=lazarus_3_2
diff --git a/sources/revision.inc b/sources/revision.inc
index d390a004..08730ad1 100644
--- a/sources/revision.inc
+++ b/sources/revision.inc
@@ -1,4 +1,4 @@
 const
-  {%H-}DELUXEVERSION='2.4.0fp';
-  {%H-}RevisionStr='504';
-  {%H-}VersionDate='20241102';
+  {%H-}DELUXEVERSION='2.4.0f';
+  {%H-}RevisionStr='506';
+  {%H-}VersionDate='20241224';
diff --git a/sources/updeluxe/fpcupdeluxemainform.lfm b/sources/updeluxe/fpcupdeluxemainform.lfm
index ed0f55bd..87f75700 100644
--- a/sources/updeluxe/fpcupdeluxemainform.lfm
+++ b/sources/updeluxe/fpcupdeluxemainform.lfm
@@ -9,11 +9,11 @@ object Form1: TForm1
   ClientWidth = 1190
   Constraints.MinHeight = 400
   Menu = MainMenu1
-  LCLVersion = '3.99.0.0'
-  Visible = True
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  LCLVersion = '3.2.0.0'
+  Visible = True
   object btnSetupPlus: TButton
     AnchorSideLeft.Control = PageControl1
     AnchorSideTop.Control = PageControl1
@@ -700,11 +700,11 @@ object Form1: TForm1
       Caption = 'WA'
       Images = ImageList_32x32
       ImageIndex = 7
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 9
-      OnClick = QuickBtnClick
     end
     object TrunkBtn: TBitBtn
       AnchorSideLeft.Control = Panel1
@@ -721,11 +721,11 @@ object Form1: TForm1
       Caption = 'Trunk'
       Images = ImageList_32x32
       ImageIndex = 4
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 0
-      OnClick = QuickBtnClick
     end
     object FixesBtn: TBitBtn
       AnchorSideLeft.Control = TrunkBtn
@@ -743,11 +743,11 @@ object Form1: TForm1
       Caption = 'Fixes'
       Images = ImageList_32x32
       ImageIndex = 0
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 1
-      OnClick = QuickBtnClick
     end
     object StableBtn: TBitBtn
       AnchorSideLeft.Control = FixesBtn
@@ -765,11 +765,11 @@ object Form1: TForm1
       Caption = 'Stable'
       Images = ImageList_32x32
       ImageIndex = 3
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 2
-      OnClick = QuickBtnClick
     end
     object AndroidBtn: TBitBtn
       AnchorSideLeft.Control = StableBtn
@@ -787,11 +787,11 @@ object Form1: TForm1
       Caption = 'LAMW'
       Images = ImageList_32x32
       ImageIndex = 6
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 3
-      OnClick = QuickBtnClick
     end
     object WioBtn: TBitBtn
       AnchorSideLeft.Control = WABtn
@@ -809,11 +809,11 @@ object Form1: TForm1
       Caption = 'Wio'
       Images = ImageList_32x32
       ImageIndex = 14
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 4
-      OnClick = QuickBtnClick
     end
     object PicoBtn: TBitBtn
       AnchorSideLeft.Control = WioBtn
@@ -831,11 +831,11 @@ object Form1: TForm1
       Caption = 'Pico'
       Images = ImageList_32x32
       ImageIndex = 12
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 5
-      OnClick = QuickBtnClick
     end
     object UltiboBtn: TBitBtn
       AnchorSideLeft.Control = ESPBtn
@@ -852,11 +852,11 @@ object Form1: TForm1
       BorderSpacing.Around = 4
       Images = ImageList_88x32
       ImageIndex = 1
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 6
-      OnClick = QuickBtnClick
     end
     object mORMotBtn: TBitBtn
       AnchorSideLeft.Control = UltiboBtn
@@ -874,11 +874,11 @@ object Form1: TForm1
       Caption = 'mORMot2'
       Images = ImageList_32x32
       ImageIndex = 11
+      OnClick = btnInstallModuleClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 7
-      OnClick = btnInstallModuleClick
     end
     object ESPBtn: TBitBtn
       AnchorSideLeft.Control = PicoBtn
@@ -896,11 +896,11 @@ object Form1: TForm1
       Caption = 'ESP32'
       Images = ImageList_32x32
       ImageIndex = 10
+      OnClick = QuickBtnClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 10
-      OnClick = QuickBtnClick
     end
     object BitBtnHalt: TBitBtn
       AnchorSideTop.Control = Panel1
@@ -920,11 +920,11 @@ object Form1: TForm1
       Enabled = False
       Images = ImageList_32x32
       ImageIndex = 5
+      OnClick = BitBtnHaltClick
       ParentFont = False
       ParentShowHint = False
       ShowHint = True
       TabOrder = 8
-      OnClick = BitBtnHaltClick
     end
   end
   object memoSummary: TMemo
@@ -1081,11 +1081,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_32x32
         ImageIndex = 1
+        OnClick = InstallClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 0
-        OnClick = InstallClick
       end
       object BitBtnLazarusOnly: TBitBtn
         AnchorSideLeft.Control = ListBoxLazarusTarget
@@ -1106,11 +1106,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_32x32
         ImageIndex = 2
+        OnClick = InstallClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 1
-        OnClick = InstallClick
       end
       object BitBtnFPCandLazarus: TBitBtn
         AnchorSideLeft.Control = BasicSheet
@@ -1135,11 +1135,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_88x32
         ImageIndex = 0
+        OnClick = InstallClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 2
-        OnClick = InstallClick
       end
       object chkGitlab: TCheckBox
         AnchorSideLeft.Control = BasicSheet
@@ -1237,10 +1237,10 @@ object Form1: TForm1
           'riscv32'
           'riscv64'
         )
+        OnSelectionChanged = radgrpTargetChanged
         ParentFont = False
         ParentShowHint = False
         TabOrder = 0
-        OnSelectionChanged = radgrpTargetChanged
       end
       object radgrpOS: TRadioGroup
         AnchorSideLeft.Control = radgrpCPU
@@ -1298,10 +1298,10 @@ object Form1: TForm1
           'wasi'
           'atari'
         )
+        OnSelectionChanged = radgrpTargetChanged
         ParentFont = False
         ParentShowHint = False
         TabOrder = 1
-        OnSelectionChanged = radgrpTargetChanged
       end
       object ButtonInstallCrossCompiler: TButton
         AnchorSideLeft.Control = radgrpCPU
@@ -1502,10 +1502,10 @@ object Form1: TForm1
         Caption = 'OPM'
         Images = ImageList_32x32
         ImageIndex = 9
+        OnClick = btnInstallModuleClick
         ParentShowHint = False
         ShowHint = True
         TabOrder = 4
-        OnClick = btnInstallModuleClick
       end
       object DockBtn: TBitBtn
         AnchorSideLeft.Control = OPMBtn
@@ -1526,10 +1526,10 @@ object Form1: TForm1
         Caption = 'Dock'
         Images = ImageList_32x32
         ImageIndex = 8
+        OnClick = btnInstallModuleClick
         ParentShowHint = False
         ShowHint = True
         TabOrder = 5
-        OnClick = btnInstallModuleClick
       end
     end
     object TagSheet: TTabSheet
@@ -1643,11 +1643,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_32x32
         ImageIndex = 1
+        OnClick = OnlyTagClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 2
-        OnClick = OnlyTagClick
       end
       object BitBtnLazarusOnlyTag: TBitBtn
         AnchorSideLeft.Control = ListBoxLazarusTargetTag
@@ -1668,11 +1668,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_32x32
         ImageIndex = 2
+        OnClick = OnlyTagClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 3
-        OnClick = OnlyTagClick
       end
       object MemoAddTag: TMemo
         AnchorSideLeft.Control = TagSheet
@@ -1761,11 +1761,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_32x32
         ImageIndex = 1
+        OnClick = BitBtnSetRevisionClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 0
-        OnClick = BitBtnSetRevisionClick
       end
       object BitBtnLazarusSetRevision: TBitBtn
         AnchorSideLeft.Control = HistorySheet
@@ -1789,11 +1789,11 @@ object Form1: TForm1
         Layout = blGlyphTop
         Images = ImageList_32x32
         ImageIndex = 2
+        OnClick = BitBtnSetRevisionClick
         ParentFont = False
         ParentShowHint = False
         ShowHint = True
         TabOrder = 1
-        OnClick = BitBtnSetRevisionClick
       end
       object MemoHistory: TMemo
         AnchorSideLeft.Control = HistorySheet
diff --git a/sources/updeluxe/fpcupdeluxemainform.pas b/sources/updeluxe/fpcupdeluxemainform.pas
index 004ff698..573b99b1 100644
--- a/sources/updeluxe/fpcupdeluxemainform.pas
+++ b/sources/updeluxe/fpcupdeluxemainform.pas
@@ -337,6 +337,8 @@   TForm1 = class(TForm)
   upSelectCPUTarget = 'Please select a CPU target first.';
   upSelectOSTarget = 'Please select an OS target first.';
 
+  upGITNotFound = 'No GIT executable found on system. Tag-list cannot be received.';
+
 var
   Form1: TForm1;
 
@@ -1921,6 +1923,9 @@ procedure TForm1.PageControl1Change(Sender: TObject);
 
     if FileExists(GitExe) then
     begin
+      //Do this only once !!
+      TPageControl(Sender).OnChange:=nil;
+
       aTargetListBox[FPC]:=ListBoxFPCTargetTag;
       aTargetListBox[LAZARUS]:=ListBoxLazarusTargetTag;
 
@@ -1970,10 +1975,11 @@ procedure TForm1.PageControl1Change(Sender: TObject);
       end;
 
       aFileList.Free;
+    end
+    else
+    begin
+      AddMessage(upGITNotFound);
     end;
-
-    //Do this only once !!
-    TPageControl(Sender).OnChange:=nil;
   end;
 end;
 
diff --git a/up.res b/up.res
index a45c6884..dc923746 100644
Binary files a/up.res and b/up.res differ