From fc22be3be36790679308d0bc1e8ef5a83664bec3 Mon Sep 17 00:00:00 2001
From: Idan Miara <idan@miara.com>
Date: Tue, 30 Dec 2025 20:18:30 +0200
Subject: [PATCH 1/5] cAppPaths

---
 Source/PyScripter.dpr          |  1 +
 Source/cAppPaths.pas           | 67 ++++++++++++++++++++++++++++++++++
 Source/cPyRemoteDebugger.pas   |  5 ++-
 Source/cPyScripterSettings.pas | 13 ++++---
 Source/frmPyIDEMain.pas        |  7 ++--
 5 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 Source/cAppPaths.pas

diff --git a/Source/PyScripter.dpr b/Source/PyScripter.dpr
index 51971b2a9..acb80f3a6 100644
--- a/Source/PyScripter.dpr
+++ b/Source/PyScripter.dpr
@@ -100,6 +100,7 @@ uses
   cCodeCompletion in 'cCodeCompletion.pas',
   dlgStyleSelector in 'dlgStyleSelector.pas' {StyleSelectorForm},
   VCL.Styles.PyScripter in 'VCL.Styles.PyScripter.pas' {/  Vcl.Styles.Utils.Forms;},
+  cAppPaths in 'cAppPaths.pas',
   cPyScripterSettings in 'cPyScripterSettings.pas',
   cPySupportTypes in 'cPySupportTypes.pas',
   cPyControl in 'cPyControl.pas',
diff --git a/Source/cAppPaths.pas b/Source/cAppPaths.pas
new file mode 100644
index 000000000..c949bcd1e
--- /dev/null
+++ b/Source/cAppPaths.pas
@@ -0,0 +1,67 @@
+{-----------------------------------------------------------------------------
+ Unit Name: cAppPaths
+ Author:    PyScripter
+ Date:      30-Dec-2026
+ Purpose:   Holds the App paths
+ History:
+-----------------------------------------------------------------------------}
+
+unit cAppPaths;
+
+interface
+
+function GetEXEPath: String;
+function GetAppRootPath: String;
+function GetAppName: String;
+
+
+implementation
+
+uses
+  System.SysUtils,
+  System.IOUtils,
+  Vcl.Forms;
+
+var
+  AppName: string;
+
+  // paths including trailing path delimiter
+  EXEPath: string;
+  AppRootPath: string;
+
+function GetAppName: String;
+begin
+  Result := AppName;
+end;
+
+function GetEXEPath: String;
+begin
+  Result := EXEPath;
+end;
+
+function GetAppRootPath: String;
+begin
+  Result := AppRootPath;
+end;
+
+procedure InitPaths;
+var
+  DirName: String;
+begin
+  AppName := TPath.GetFileNameWithoutExtension(Application.ExeName);
+  EXEPath := ExtractFilePath(Application.ExeName);
+  DirName := LowerCase(ExtractFileName(ExcludeTrailingPathDelimiter(EXEPath)));
+  {$IFDEF WIN64}
+  if (DirName = 'x64') or (DirName = 'bin64') then
+  {$ELSE}
+  if (DirName = 'x86') or (DirName = 'bin') then
+  {$ENDIF}
+    AppRootPath := ExtractFilePath(ExcludeTrailingPathDelimiter(EXEPath))
+  else
+    AppRootPath := EXEPath;
+end;
+
+initialization
+  InitPaths;
+
+end.
diff --git a/Source/cPyRemoteDebugger.pas b/Source/cPyRemoteDebugger.pas
index 24396f99b..f98f4c595 100644
--- a/Source/cPyRemoteDebugger.pas
+++ b/Source/cPyRemoteDebugger.pas
@@ -187,7 +187,8 @@ implementation
   cPyScripterSettings,
   cPyControl,
   cTools,
-  uCommonFunctions;
+  uCommonFunctions,
+  cAppPaths;
 
 { TRemNameSpaceItem }
 constructor TRemNameSpaceItem.Create(AName: string; const APyObject: Variant;
@@ -497,7 +498,7 @@ constructor TPyRemoteInterpreter.Create(AEngineType: TPythonEngineType = peRemot
 
   FOldsysmodules := SysModule.modules.copy();
   try
-    FRpycPath := Format('%sLib\%s', [ExtractFilePath(Application.ExeName), RpycZipModule]);
+    FRpycPath := Format('%sLib\%s', [GetAppRootPath, RpycZipModule]);
     GI_PyControl.InternalInterpreter.SysPathAdd(FRpycPath);
     Rpyc := Import('rpyc');
     FServerIsAvailable := True;
diff --git a/Source/cPyScripterSettings.pas b/Source/cPyScripterSettings.pas
index 1f7582b27..4f42bfc48 100644
--- a/Source/cPyScripterSettings.pas
+++ b/Source/cPyScripterSettings.pas
@@ -434,7 +434,8 @@ implementation
   SynUnicode,
   SynEditRegexSearch,
   StringResources,
-  uCommonFunctions;
+  uCommonFunctions,
+  cAppPaths;
 
 { TPythonIDEOptions }
 
@@ -1131,18 +1132,18 @@ class procedure TPyScripterSettings.CreateSearchOptions;
 
 var
   PublicPath: string;
-  AppName, AppININame, EXEPath: string;
+  AppName, AppININame, AppRootPath: string;
 begin
-  AppName := TPath.GetFileNameWithoutExtension(Application.ExeName);
+  AppName := GetAppName;
   AppININame := AppName + '.ini';
-  EXEPath := TPath.GetDirectoryName(Application.ExeName);
+  AppRootPath := GetAppRootPath;
 
-  OptionsFileName := TPath.Combine(EXEPath, AppININame);
+  OptionsFileName := TPath.Combine(AppRootPath, AppININame);
   IsPortable := FileExists(OptionsFileName);
   if IsPortable then
   begin
     // Portable version - nothing is stored in other directories
-    UserDataPath := EXEPath;
+    UserDataPath := AppRootPath;
     ColorThemesFilesDir := TPath.Combine(UserDataPath, 'Highlighters');
     StylesFilesDir := TPath.Combine(UserDataPath, 'Styles');
     LspServerPath :=  TPath.Combine(UserDataPath, 'Lib', 'Lsp');
diff --git a/Source/frmPyIDEMain.pas b/Source/frmPyIDEMain.pas
index 0241df486..c21371e96 100644
--- a/Source/frmPyIDEMain.pas
+++ b/Source/frmPyIDEMain.pas
@@ -718,7 +718,8 @@ interface
   SynEdit,
   uEditAppIntfs,
   cFileTemplates,
-  cPySupportTypes;
+  cPySupportTypes,
+  cAppPaths;
 
 const
   WM_FINDDEFINITION = WM_USER + 100;
@@ -1464,7 +1465,7 @@ procedure TPyIDEMainForm.FormCreate(Sender: TObject);
     MulDiv(FShellImages.Height, FCurrentPPI, Screen.PixelsPerInch));
 
   //Set the HelpFile
-  Application.HelpFile := ExtractFilePath(Application.ExeName) + 'PyScripter.chm';
+  Application.HelpFile := GetAppRootPath + 'PyScripter.chm';
   // In zip distributions the help file may be blocked
   if IsFileBlocked(Application.HelpFile) then
     UnblockFile(Application.HelpFile);
@@ -2854,7 +2855,7 @@ procedure TPyIDEMainForm.SetupLanguageMenu;
 begin
   mnLanguage.Clear;
   CurrentLanguage := GetCurrentLanguage;
-  DefaultInstance.bindtextdomainToFile ('languagecodes',ExtractFilePath(Application.ExeName)+'locale\languagecodes.mo');
+  DefaultInstance.bindtextdomainToFile ('languagecodes',GetAppRootPath+'locale\languagecodes.mo');
   DefaultInstance.GetListOfLanguages ('default',FLanguageList);
   FLanguageList.Insert(0, 'en');
   HaveLang := False;

From 536f18059797aed952e548a4f7c34adccdcc2659 Mon Sep 17 00:00:00 2001
From: Idan Miara <idan@miara.com>
Date: Tue, 30 Dec 2025 21:25:44 +0200
Subject: [PATCH 2/5] move WebView2Loader.dll binaries dirs to the root

---
 .../Dependencies/x64 => x64}/WebView2Loader.dll     | Bin
 .../Dependencies/x86 => x86}/WebView2Loader.dll     | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {Install/Dependencies/x64 => x64}/WebView2Loader.dll (100%)
 rename {Install/Dependencies/x86 => x86}/WebView2Loader.dll (100%)

diff --git a/Install/Dependencies/x64/WebView2Loader.dll b/x64/WebView2Loader.dll
similarity index 100%
rename from Install/Dependencies/x64/WebView2Loader.dll
rename to x64/WebView2Loader.dll
diff --git a/Install/Dependencies/x86/WebView2Loader.dll b/x86/WebView2Loader.dll
similarity index 100%
rename from Install/Dependencies/x86/WebView2Loader.dll
rename to x86/WebView2Loader.dll

From c90ba147a05ef5099b13d00dfb3059ad54f731bd Mon Sep 17 00:00:00 2001
From: Idan Miara <idan@miara.com>
Date: Tue, 30 Dec 2025 21:29:55 +0200
Subject: [PATCH 3/5] PyScripter.dproj - remove WebView2Loader.dll post build
 copy event and change the build dir to x86/x64 subdir

---
 Source/PyScripter.dproj | 823 +++++++++++++++++++---------------------
 1 file changed, 396 insertions(+), 427 deletions(-)

diff --git a/Source/PyScripter.dproj b/Source/PyScripter.dproj
index 193c89aa3..226904e2f 100644
--- a/Source/PyScripter.dproj
+++ b/Source/PyScripter.dproj
@@ -1,427 +1,396 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <Base>True</Base>
-        <AppType>Application</AppType>
-        <Config Condition="'$(Config)'==''">Debug</Config>
-        <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-        <FrameworkType>VCL</FrameworkType>
-        <MainSource>PyScripter.dpr</MainSource>
-        <Platform Condition="'$(Platform)'==''">Win64</Platform>
-        <ProjectGuid>{FD7531E1-BDA2-4EF3-A3E8-074B952317EF}</ProjectGuid>
-        <ProjectName Condition="'$(ProjectName)'==''">PyScripter</ProjectName>
-        <ProjectVersion>20.3</ProjectVersion>
-        <TargetedPlatforms>3</TargetedPlatforms>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-        <Base>true</Base>
-    </PropertyGroup>
-    <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)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
-        <Base_Win64>true</Base_Win64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
-        <Cfg_1>true</Cfg_1>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
-        <Cfg_2>true</Cfg_2>
-        <CfgParent>Base</CfgParent>
-        <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>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
-        <Cfg_2_Win64>true</Cfg_2_Win64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>PyScripter</SanitizedProjectName>
-        <Custom_Styles>&quot;Windows11 Impressive Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Impressive_Light.vsf&quot;;&quot;Windows11 MineShaft|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_MineShaft.vsf&quot;</Custom_Styles>
-        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
-        <DCC_DependencyCheckOutputName>PyScripter.exe</DCC_DependencyCheckOutputName>
-        <DCC_ExeOutput>.\..</DCC_ExeOutput>
-        <DCC_ImageBase>00400000</DCC_ImageBase>
-        <DCC_MapFile>3</DCC_MapFile>
-        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
-        <DCC_Platform>x86</DCC_Platform>
-        <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
-        <DCC_StringChecks>off</DCC_StringChecks>
-        <DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
-        <DCC_UsePackage>vcl;rtl;vcldb;dbrtl;vclx;xmlrtl;vclie;inetdbbde;inet;inetdbxpress;IndySystem;IndyCore;dclOfficeXP;VclSmp;soaprtl;dsnap;IndyProtocols;inetdb;bdertl;vcldbx;vclactnband;vclshlctrls;teeui;teedb;tee;DJcl;JvStdCtrlsD9R;JvAppFrmD9R;JvCoreD9R;JvBandsD9R;JvDlgsD9R;JvCmpD9R;JvCtrlsD9R;JvCustomD9R;JvDockingD9R;JvHMID9R;JvInspectorD9R;JvPageCompsD9R;JvPluginD9R;JvSystemD9R;JvValidatorsD9R;Python_bds3;SynEdit_R2005;tb2k_d9;tbx_d9;VirtualTreesD9;VirtualShellToolsD9;FreeComp9;DJclVcl;mbTBXJvLibD9D;JvRuntimeDesignD9R;$(DCC_UsePackage)</DCC_UsePackage>
-        <Icon_MainIcon>PyScripter_Icon.ico</Icon_MainIcon>
-        <Manifest_File>None</Manifest_File>
-        <PostBuildEvent><![CDATA[copy "$(BDS)\Redist\$(Platform)\WebView2Loader.dll" $(OUTPUTDIR)
-$(PostBuildEvent)]]></PostBuildEvent>
-        <VCL_Custom_Styles>Carbon|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Carbon.vsf;Coral|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Coral.vsf;Jet|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Jet.vsf;Luna|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Luna.vsf;Windows10|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Windows10.vsf</VCL_Custom_Styles>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=PyScripter Python IDE;FileVersion=5.3.1.0;InternalName=;LegalCopyright=(c) Kiriakos Vlahos;LegalTrademarks=;OriginalFilename=PyScripter.exe;ProductName=PyScripter;ProductVersion=5.3.0.0;Comments=</VerInfo_Keys>
-        <VerInfo_Locale>2057</VerInfo_Locale>
-        <VerInfo_MajorVer>5</VerInfo_MajorVer>
-        <VerInfo_MinorVer>3</VerInfo_MinorVer>
-        <VerInfo_Release>1</VerInfo_Release>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <AppDPIAwarenessMode>system</AppDPIAwarenessMode>
-        <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <Icon_MainIcon>PyScripter_Icon1.ico</Icon_MainIcon>
-        <Manifest_File>PyScripter.exe.manifest</Manifest_File>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <AppDPIAwarenessMode>system</AppDPIAwarenessMode>
-        <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
-        <Icon_MainIcon>PyScripter_Icon1.ico</Icon_MainIcon>
-        <Manifest_File>PyScripter.exe.manifest</Manifest_File>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1)'!=''">
-        <DCC_DebugInformation>0</DCC_DebugInformation>
-        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2)'!=''">
-        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-        <BT_BuildType>Debug</BT_BuildType>
-        <DCC_DebugDCUs>true</DCC_DebugDCUs>
-        <Debugger_IncludeSystemVars>true</Debugger_IncludeSystemVars>
-        <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-        <ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
-        <MapFile>3</MapFile>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-        <DCC_DebugDCUs>true</DCC_DebugDCUs>
-        <ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
-        <MapFile>3</MapFile>
-    </PropertyGroup>
-    <ItemGroup>
-        <DelphiCompile Include="$(MainSource)">
-            <MainSource>MainSource</MainSource>
-        </DelphiCompile>
-        <DCCReference Include="uCmdLine.pas"/>
-        <DCCReference Include="dlgExceptionMail.pas">
-            <Form>ExceptionDialogMail</Form>
-        </DCCReference>
-        <DCCReference Include="frmPyIDEMain.pas">
-            <Form>PyIDEMainForm</Form>
-        </DCCReference>
-        <DCCReference Include="uEditAppIntfs.pas"/>
-        <DCCReference Include="frmEditor.pas">
-            <Form>EditorForm</Form>
-        </DCCReference>
-        <DCCReference Include="dmResources.pas">
-            <Form>ResourcesDataModule</Form>
-            <DesignClass>TDataModule</DesignClass>
-        </DCCReference>
-        <DCCReference Include="dmCommands.pas">
-            <Form>CommandsDataModule</Form>
-            <DesignClass>TDataModule</DesignClass>
-        </DCCReference>
-        <DCCReference Include="uHighlighterProcs.pas"/>
-        <DCCReference Include="dlgConfirmReplace.pas">
-            <Form>ConfirmReplaceDialog</Form>
-        </DCCReference>
-        <DCCReference Include="frmPythonII.pas">
-            <Form>PythonIIForm</Form>
-        </DCCReference>
-        <DCCReference Include="frmMessages.pas">
-            <Form>MessagesWindow</Form>
-        </DCCReference>
-        <DCCReference Include="cPyDebugger.pas"/>
-        <DCCReference Include="dlgSynPageSetup.pas">
-            <Form>PageSetupDlg</Form>
-        </DCCReference>
-        <DCCReference Include="dlgSynPrintPreview.pas">
-            <Form>PrintPreviewDlg</Form>
-        </DCCReference>
-        <DCCReference Include="frmCallStack.pas">
-            <Form>CallStackWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmBreakPoints.pas">
-            <Form>BreakPointsWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmWatches.pas">
-            <Form>WatchesWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmVariables.pas">
-            <Form>VariablesWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmCodeExplorer.pas">
-            <Form>CodeExplorerWindow</Form>
-        </DCCReference>
-        <DCCReference Include="dlgOptionsEditor.pas">
-            <Form>OptionsInspector</Form>
-        </DCCReference>
-        <DCCReference Include="dlgDirectoryList.pas">
-            <Form>DirectoryListDialog</Form>
-        </DCCReference>
-        <DCCReference Include="frmFileExplorer.pas">
-            <Form>FileExplorerWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmIDEDockWin.pas">
-            <Form>IDEDockWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmDisassemlyView.pas">
-            <Form>DisForm</Form>
-        </DCCReference>
-        <DCCReference Include="frmDocView.pas">
-            <Form>DocForm</Form>
-        </DCCReference>
-        <DCCReference Include="frmWebPreview.pas">
-            <Form>WebPreviewForm</Form>
-        </DCCReference>
-        <DCCReference Include="SynHighlighterPython.pas"/>
-        <DCCReference Include="frmToDo.pas">
-            <Form>ToDoWindow</Form>
-        </DCCReference>
-        <DCCReference Include="dlgToDoOptions.pas">
-            <Form>ToDoOptionsDlg</Form>
-        </DCCReference>
-        <DCCReference Include="cFileSearch.pas"/>
-        <DCCReference Include="cFindInFiles.pas"/>
-        <DCCReference Include="dlgFindInFiles.pas">
-            <Form>FindInFilesDialog</Form>
-        </DCCReference>
-        <DCCReference Include="frmFindResults.pas">
-            <Form>FindResultsWindow</Form>
-        </DCCReference>
-        <DCCReference Include="dlgFindResultsOptions.pas">
-            <Form>FindResultsOptionsDialog</Form>
-        </DCCReference>
-        <DCCReference Include="dlgReplaceInFiles.pas">
-            <Form>ReplaceInFilesDialog</Form>
-        </DCCReference>
-        <DCCReference Include="cParameters.pas"/>
-        <DCCReference Include="uParams.pas"/>
-        <DCCReference Include="dlgCustomParams.pas">
-            <Form>CustomizeParams</Form>
-        </DCCReference>
-        <DCCReference Include="dlgAskParam.pas">
-            <Form>AskParamForm</Form>
-        </DCCReference>
-        <DCCReference Include="dlgFileTemplates.pas">
-            <Form>FileTemplatesDialog</Form>
-        </DCCReference>
-        <DCCReference Include="cTools.pas"/>
-        <DCCReference Include="dlgCollectionEditor.pas">
-            <Form>CollectionEditor</Form>
-        </DCCReference>
-        <DCCReference Include="dlgToolProperties.pas">
-            <Form>ToolProperties</Form>
-        </DCCReference>
-        <DCCReference Include="frmCommandOutput.pas">
-            <Form>OutputWindow</Form>
-        </DCCReference>
-        <DCCReference Include="frmFunctionList.pas">
-            <Form>FunctionListWindow</Form>
-        </DCCReference>
-        <DCCReference Include="uCommonFunctions.pas"/>
-        <DCCReference Include="StringResources.pas"/>
-        <DCCReference Include="SynCompletionProposal.pas"/>
-        <DCCReference Include="frmRegExpTester.pas">
-            <Form>RegExpTesterWindow</Form>
-        </DCCReference>
-        <DCCReference Include="cCodeHint.pas"/>
-        <DCCReference Include="dlgCommandLine.pas">
-            <Form>CommandLineDlg</Form>
-        </DCCReference>
-        <DCCReference Include="dlgCustomShortcuts.pas">
-            <Form>frmCustomKeyboard</Form>
-        </DCCReference>
-        <DCCReference Include="dlgUnitTestWizard.pas">
-            <Form>UnitTestWizard</Form>
-        </DCCReference>
-        <DCCReference Include="frmUnitTests.pas">
-            <Form>UnitTestWindow</Form>
-        </DCCReference>
-        <DCCReference Include="cFilePersist.pas"/>
-        <DCCReference Include="dlgPickList.pas">
-            <Form>PickListDialog</Form>
-        </DCCReference>
-        <DCCReference Include="dlgAboutPyScripter.pas">
-            <Form>AboutBox</Form>
-        </DCCReference>
-        <DCCReference Include="cPyBaseDebugger.pas"/>
-        <DCCReference Include="cPyRemoteDebugger.pas"/>
-        <DCCReference Include="cFileTemplates.pas"/>
-        <DCCReference Include="dlgCodeTemplates.pas">
-            <Form>CodeTemplates</Form>
-        </DCCReference>
-        <DCCReference Include="dlgNewFile.pas">
-            <Form>NewFileDialog</Form>
-        </DCCReference>
-        <DCCReference Include="JvDockVSNetStyle.pas"/>
-        <DCCReference Include="JvDockControlForm.pas"/>
-        <DCCReference Include="uSearchHighlighter.pas"/>
-        <DCCReference Include="frmModSpTBXCustomize.pas"/>
-        <DCCReference Include="cProjectClasses.pas"/>
-        <DCCReference Include="frmProjectExplorer.pas">
-            <Form>ProjectExplorerWindow</Form>
-        </DCCReference>
-        <DCCReference Include="dlgImportDirectory.pas">
-            <Form>ImportDirectoryForm</Form>
-        </DCCReference>
-        <DCCReference Include="dlgRunConfiguration.pas">
-            <Form>RunConfigurationForm</Form>
-        </DCCReference>
-        <DCCReference Include="dlgPyIDEBase.pas">
-            <Form>PyIDEDlgBase</Form>
-        </DCCReference>
-        <DCCReference Include="JvDockInfo.pas"/>
-        <DCCReference Include="dlgSynEditOptions.pas">
-            <Form>EditorOptionsDialog</Form>
-            <DesignClass>TForm</DesignClass>
-        </DCCReference>
-        <DCCReference Include="JvDockSupportControl.pas"/>
-        <DCCReference Include="JvDockVIDStyle.pas"/>
-        <DCCReference Include="cCodeCompletion.pas"/>
-        <DCCReference Include="dlgStyleSelector.pas">
-            <Form>StyleSelectorForm</Form>
-        </DCCReference>
-        <DCCReference Include="VCL.Styles.PyScripter.pas">
-            <Form>/  Vcl.Styles.Utils.Forms;</Form>
-        </DCCReference>
-        <DCCReference Include="cPyScripterSettings.pas"/>
-        <DCCReference Include="cPySupportTypes.pas"/>
-        <DCCReference Include="cPyControl.pas"/>
-        <DCCReference Include="JvGnugettext.pas"/>
-        <DCCReference Include="cInternalPython.pas"/>
-        <DCCReference Include="dlgPythonVersions.pas">
-            <Form>PythonVersionsDialog</Form>
-        </DCCReference>
-        <DCCReference Include="cSSHSupport.pas"/>
-        <DCCReference Include="dlgRemoteFile.pas">
-            <Form>RemoteFileDialog</Form>
-        </DCCReference>
-        <DCCReference Include="cPySSHDebugger.pas"/>
-        <DCCReference Include="RtlVclFixes.pas"/>
-        <DCCReference Include="JvDockAdvTree.pas"/>
-        <DCCReference Include="JvDockSupportProc.pas"/>
-        <DCCReference Include="JvDockTree.pas"/>
-        <DCCReference Include="JvDockVSNetStyleSpTBX.pas"/>
-        <DCCReference Include="SynEditLsp.pas"/>
-        <DCCReference Include="uLLMSupport.pas"/>
-        <DCCReference Include="frmLLMChat.pas">
-            <Form>LLMChatForm</Form>
-        </DCCReference>
-        <DCCReference Include="frmSuggest.pas">
-            <Form>SuggestWindow</Form>
-        </DCCReference>
-        <DCCReference Include="cLSPClients.pas"/>
-        <DCCReference Include="uPythonItfs.pas"/>
-        <None Include="PyScripter.todo"/>
-        <BuildConfiguration Include="Base">
-            <Key>Base</Key>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Release">
-            <Key>Cfg_1</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Debug">
-            <Key>Cfg_2</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-    </ItemGroup>
-    <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-    <ProjectExtensions>
-        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-        <Borland.ProjectType>VCLApplication</Borland.ProjectType>
-        <BorlandProject>
-            <Delphi.Personality>
-                <Source>
-                    <Source Name="MainSource">PyScripter.dpr</Source>
-                </Source>
-                <Excluded_Packages/>
-                <VersionInfo>
-                    <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                    <VersionInfo Name="Debug">False</VersionInfo>
-                    <VersionInfo Name="PreRelease">False</VersionInfo>
-                    <VersionInfo Name="Special">False</VersionInfo>
-                    <VersionInfo Name="Private">False</VersionInfo>
-                    <VersionInfo Name="DLL">False</VersionInfo>
-                    <VersionInfo Name="Locale">2057</VersionInfo>
-                    <VersionInfo Name="CodePage">1252</VersionInfo>
-                </VersionInfo>
-                <VersionInfoKeys>
-                    <VersionInfoKeys Name="CompanyName"/>
-                    <VersionInfoKeys Name="FileDescription">PyScripter Python IDE</VersionInfoKeys>
-                    <VersionInfoKeys Name="FileVersion">2.4.4.0</VersionInfoKeys>
-                    <VersionInfoKeys Name="InternalName"/>
-                    <VersionInfoKeys Name="LegalCopyright"/>
-                    <VersionInfoKeys Name="LegalTrademarks"/>
-                    <VersionInfoKeys Name="OriginalFilename"/>
-                    <VersionInfoKeys Name="ProductName">PyScripter</VersionInfoKeys>
-                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                    <VersionInfoKeys Name="Comments"/>
-                </VersionInfoKeys>
-                <Parameters>
-                    <Parameters Name="UseLauncher">False</Parameters>
-                    <Parameters Name="LoadAllSymbols">True</Parameters>
-                    <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-                </Parameters>
-            </Delphi.Personality>
-            <ModelSupport>False</ModelSupport>
-            <Platforms>
-                <Platform value="Win32">True</Platform>
-                <Platform value="Win64">True</Platform>
-            </Platforms>
-            <MMX>
-                <UsesClauseFormatter AutoFormat="0">
-                    <GroupNames>WinApi;System.Win;System;Data;Vcl</GroupNames>
-                </UsesClauseFormatter>
-            </MMX>
-        </BorlandProject>
-        <ProjectFileVersion>12</ProjectFileVersion>
-    </ProjectExtensions>
-    <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
-    <PropertyGroup Condition="'$(Config)'=='Release' And '$(Platform)'=='Win32'">
-        <PreBuildEvent/>
-        <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
-        <PreLinkEvent/>
-        <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
-        <PostBuildEvent>copy &quot;$(BDS)\Redist\$(Platform)\WebView2Loader.dll&quot; $(OUTPUTDIR)
</PostBuildEvent>
-        <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Release' And '$(Platform)'=='Win64'">
-        <PreBuildEvent/>
-        <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
-        <PreLinkEvent/>
-        <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
-        <PostBuildEvent>copy &quot;$(BDS)\Redist\$(Platform)\WebView2Loader.dll&quot; $(OUTPUTDIR)
</PostBuildEvent>
-        <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' And '$(Platform)'=='Win32'">
-        <PreBuildEvent/>
-        <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
-        <PreLinkEvent/>
-        <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
-        <PostBuildEvent>copy &quot;$(BDS)\Redist\$(Platform)\WebView2Loader.dll&quot; $(OUTPUTDIR)
</PostBuildEvent>
-        <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' And '$(Platform)'=='Win64'">
-        <PreBuildEvent/>
-        <PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
-        <PreLinkEvent/>
-        <PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
-        <PostBuildEvent>copy &quot;$(BDS)\Redist\$(Platform)\WebView2Loader.dll&quot; $(OUTPUTDIR)
</PostBuildEvent>
-        <PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
-    </PropertyGroup>
-</Project>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <Base>True</Base>
+        <AppType>Application</AppType>
+        <Config Condition="'$(Config)'==''">Debug</Config>
+        <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+        <FrameworkType>VCL</FrameworkType>
+        <MainSource>PyScripter.dpr</MainSource>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
+        <ProjectGuid>{FD7531E1-BDA2-4EF3-A3E8-074B952317EF}</ProjectGuid>
+        <ProjectName Condition="'$(ProjectName)'==''">PyScripter</ProjectName>
+        <ProjectVersion>20.3</ProjectVersion>
+        <TargetedPlatforms>3</TargetedPlatforms>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <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)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <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>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+        <Cfg_2_Win64>true</Cfg_2_Win64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <SanitizedProjectName>PyScripter</SanitizedProjectName>
+        <Custom_Styles>&quot;Windows11 Impressive Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Impressive_Light.vsf&quot;;&quot;Windows11 MineShaft|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_MineShaft.vsf&quot;</Custom_Styles>
+        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
+        <DCC_DependencyCheckOutputName>PyScripter.exe</DCC_DependencyCheckOutputName>
+        <DCC_ExeOutput>.\..</DCC_ExeOutput>
+        <DCC_ImageBase>00400000</DCC_ImageBase>
+        <DCC_MapFile>3</DCC_MapFile>
+        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Platform>x86</DCC_Platform>
+        <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
+        <DCC_StringChecks>off</DCC_StringChecks>
+        <DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
+        <DCC_UsePackage>vcl;rtl;vcldb;dbrtl;vclx;xmlrtl;vclie;inetdbbde;inet;inetdbxpress;IndySystem;IndyCore;dclOfficeXP;VclSmp;soaprtl;dsnap;IndyProtocols;inetdb;bdertl;vcldbx;vclactnband;vclshlctrls;teeui;teedb;tee;DJcl;JvStdCtrlsD9R;JvAppFrmD9R;JvCoreD9R;JvBandsD9R;JvDlgsD9R;JvCmpD9R;JvCtrlsD9R;JvCustomD9R;JvDockingD9R;JvHMID9R;JvInspectorD9R;JvPageCompsD9R;JvPluginD9R;JvSystemD9R;JvValidatorsD9R;Python_bds3;SynEdit_R2005;tb2k_d9;tbx_d9;VirtualTreesD9;VirtualShellToolsD9;FreeComp9;DJclVcl;mbTBXJvLibD9D;JvRuntimeDesignD9R;$(DCC_UsePackage)</DCC_UsePackage>
+        <Icon_MainIcon>PyScripter_Icon.ico</Icon_MainIcon>
+        <Manifest_File>None</Manifest_File>
+        <VCL_Custom_Styles>Carbon|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Carbon.vsf;Coral|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Coral.vsf;Jet|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Jet.vsf;Luna|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Luna.vsf;Windows10|VCLSTYLE|$(PUBLIC)\Documents\Embarcadero\Studio\15.0\Styles\Windows10.vsf</VCL_Custom_Styles>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Keys>CompanyName=;FileDescription=PyScripter Python IDE;FileVersion=5.3.1.0;InternalName=;LegalCopyright=(c) Kiriakos Vlahos;LegalTrademarks=;OriginalFilename=PyScripter.exe;ProductName=PyScripter;ProductVersion=5.3.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Locale>2057</VerInfo_Locale>
+        <VerInfo_MajorVer>5</VerInfo_MajorVer>
+        <VerInfo_MinorVer>3</VerInfo_MinorVer>
+        <VerInfo_Release>1</VerInfo_Release>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <AppDPIAwarenessMode>system</AppDPIAwarenessMode>
+        <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <Icon_MainIcon>PyScripter_Icon1.ico</Icon_MainIcon>
+        <Manifest_File>PyScripter.exe.manifest</Manifest_File>
+        <DCC_ExeOutput>.\..\x86</DCC_ExeOutput>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <AppDPIAwarenessMode>system</AppDPIAwarenessMode>
+        <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <Icon_MainIcon>PyScripter_Icon1.ico</Icon_MainIcon>
+        <Manifest_File>PyScripter.exe.manifest</Manifest_File>
+        <DCC_ExeOutput>.\..\x64</DCC_ExeOutput>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <DCC_DebugInformation>0</DCC_DebugInformation>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+        <BT_BuildType>Debug</BT_BuildType>
+        <DCC_DebugDCUs>true</DCC_DebugDCUs>
+        <Debugger_IncludeSystemVars>true</Debugger_IncludeSystemVars>
+        <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+        <ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
+        <MapFile>3</MapFile>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <BT_BuildType>Debug</BT_BuildType>
+        <DCC_DebugDCUs>true</DCC_DebugDCUs>
+        <ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
+        <MapFile>3</MapFile>
+    </PropertyGroup>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="uCmdLine.pas"/>
+        <DCCReference Include="dlgExceptionMail.pas">
+            <Form>ExceptionDialogMail</Form>
+        </DCCReference>
+        <DCCReference Include="frmPyIDEMain.pas">
+            <Form>PyIDEMainForm</Form>
+        </DCCReference>
+        <DCCReference Include="uEditAppIntfs.pas"/>
+        <DCCReference Include="frmEditor.pas">
+            <Form>EditorForm</Form>
+        </DCCReference>
+        <DCCReference Include="dmResources.pas">
+            <Form>ResourcesDataModule</Form>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
+        <DCCReference Include="dmCommands.pas">
+            <Form>CommandsDataModule</Form>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
+        <DCCReference Include="uHighlighterProcs.pas"/>
+        <DCCReference Include="dlgConfirmReplace.pas">
+            <Form>ConfirmReplaceDialog</Form>
+        </DCCReference>
+        <DCCReference Include="frmPythonII.pas">
+            <Form>PythonIIForm</Form>
+        </DCCReference>
+        <DCCReference Include="frmMessages.pas">
+            <Form>MessagesWindow</Form>
+        </DCCReference>
+        <DCCReference Include="cPyDebugger.pas"/>
+        <DCCReference Include="dlgSynPageSetup.pas">
+            <Form>PageSetupDlg</Form>
+        </DCCReference>
+        <DCCReference Include="dlgSynPrintPreview.pas">
+            <Form>PrintPreviewDlg</Form>
+        </DCCReference>
+        <DCCReference Include="frmCallStack.pas">
+            <Form>CallStackWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmBreakPoints.pas">
+            <Form>BreakPointsWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmWatches.pas">
+            <Form>WatchesWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmVariables.pas">
+            <Form>VariablesWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmCodeExplorer.pas">
+            <Form>CodeExplorerWindow</Form>
+        </DCCReference>
+        <DCCReference Include="dlgOptionsEditor.pas">
+            <Form>OptionsInspector</Form>
+        </DCCReference>
+        <DCCReference Include="dlgDirectoryList.pas">
+            <Form>DirectoryListDialog</Form>
+        </DCCReference>
+        <DCCReference Include="frmFileExplorer.pas">
+            <Form>FileExplorerWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmIDEDockWin.pas">
+            <Form>IDEDockWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmDisassemlyView.pas">
+            <Form>DisForm</Form>
+        </DCCReference>
+        <DCCReference Include="frmDocView.pas">
+            <Form>DocForm</Form>
+        </DCCReference>
+        <DCCReference Include="frmWebPreview.pas">
+            <Form>WebPreviewForm</Form>
+        </DCCReference>
+        <DCCReference Include="SynHighlighterPython.pas"/>
+        <DCCReference Include="frmToDo.pas">
+            <Form>ToDoWindow</Form>
+        </DCCReference>
+        <DCCReference Include="dlgToDoOptions.pas">
+            <Form>ToDoOptionsDlg</Form>
+        </DCCReference>
+        <DCCReference Include="cFileSearch.pas"/>
+        <DCCReference Include="cFindInFiles.pas"/>
+        <DCCReference Include="dlgFindInFiles.pas">
+            <Form>FindInFilesDialog</Form>
+        </DCCReference>
+        <DCCReference Include="frmFindResults.pas">
+            <Form>FindResultsWindow</Form>
+        </DCCReference>
+        <DCCReference Include="dlgFindResultsOptions.pas">
+            <Form>FindResultsOptionsDialog</Form>
+        </DCCReference>
+        <DCCReference Include="dlgReplaceInFiles.pas">
+            <Form>ReplaceInFilesDialog</Form>
+        </DCCReference>
+        <DCCReference Include="cParameters.pas"/>
+        <DCCReference Include="uParams.pas"/>
+        <DCCReference Include="dlgCustomParams.pas">
+            <Form>CustomizeParams</Form>
+        </DCCReference>
+        <DCCReference Include="dlgAskParam.pas">
+            <Form>AskParamForm</Form>
+        </DCCReference>
+        <DCCReference Include="dlgFileTemplates.pas">
+            <Form>FileTemplatesDialog</Form>
+        </DCCReference>
+        <DCCReference Include="cTools.pas"/>
+        <DCCReference Include="dlgCollectionEditor.pas">
+            <Form>CollectionEditor</Form>
+        </DCCReference>
+        <DCCReference Include="dlgToolProperties.pas">
+            <Form>ToolProperties</Form>
+        </DCCReference>
+        <DCCReference Include="frmCommandOutput.pas">
+            <Form>OutputWindow</Form>
+        </DCCReference>
+        <DCCReference Include="frmFunctionList.pas">
+            <Form>FunctionListWindow</Form>
+        </DCCReference>
+        <DCCReference Include="uCommonFunctions.pas"/>
+        <DCCReference Include="StringResources.pas"/>
+        <DCCReference Include="SynCompletionProposal.pas"/>
+        <DCCReference Include="frmRegExpTester.pas">
+            <Form>RegExpTesterWindow</Form>
+        </DCCReference>
+        <DCCReference Include="cCodeHint.pas"/>
+        <DCCReference Include="dlgCommandLine.pas">
+            <Form>CommandLineDlg</Form>
+        </DCCReference>
+        <DCCReference Include="dlgCustomShortcuts.pas">
+            <Form>frmCustomKeyboard</Form>
+        </DCCReference>
+        <DCCReference Include="dlgUnitTestWizard.pas">
+            <Form>UnitTestWizard</Form>
+        </DCCReference>
+        <DCCReference Include="frmUnitTests.pas">
+            <Form>UnitTestWindow</Form>
+        </DCCReference>
+        <DCCReference Include="cFilePersist.pas"/>
+        <DCCReference Include="dlgPickList.pas">
+            <Form>PickListDialog</Form>
+        </DCCReference>
+        <DCCReference Include="dlgAboutPyScripter.pas">
+            <Form>AboutBox</Form>
+        </DCCReference>
+        <DCCReference Include="cPyBaseDebugger.pas"/>
+        <DCCReference Include="cPyRemoteDebugger.pas"/>
+        <DCCReference Include="cFileTemplates.pas"/>
+        <DCCReference Include="dlgCodeTemplates.pas">
+            <Form>CodeTemplates</Form>
+        </DCCReference>
+        <DCCReference Include="dlgNewFile.pas">
+            <Form>NewFileDialog</Form>
+        </DCCReference>
+        <DCCReference Include="JvDockVSNetStyle.pas"/>
+        <DCCReference Include="JvDockControlForm.pas"/>
+        <DCCReference Include="uSearchHighlighter.pas"/>
+        <DCCReference Include="frmModSpTBXCustomize.pas"/>
+        <DCCReference Include="cProjectClasses.pas"/>
+        <DCCReference Include="frmProjectExplorer.pas">
+            <Form>ProjectExplorerWindow</Form>
+        </DCCReference>
+        <DCCReference Include="dlgImportDirectory.pas">
+            <Form>ImportDirectoryForm</Form>
+        </DCCReference>
+        <DCCReference Include="dlgRunConfiguration.pas">
+            <Form>RunConfigurationForm</Form>
+        </DCCReference>
+        <DCCReference Include="dlgPyIDEBase.pas">
+            <Form>PyIDEDlgBase</Form>
+        </DCCReference>
+        <DCCReference Include="JvDockInfo.pas"/>
+        <DCCReference Include="dlgSynEditOptions.pas">
+            <Form>EditorOptionsDialog</Form>
+            <DesignClass>TForm</DesignClass>
+        </DCCReference>
+        <DCCReference Include="JvDockSupportControl.pas"/>
+        <DCCReference Include="JvDockVIDStyle.pas"/>
+        <DCCReference Include="cCodeCompletion.pas"/>
+        <DCCReference Include="dlgStyleSelector.pas">
+            <Form>StyleSelectorForm</Form>
+        </DCCReference>
+        <DCCReference Include="VCL.Styles.PyScripter.pas">
+            <Form>/  Vcl.Styles.Utils.Forms;</Form>
+        </DCCReference>
+        <DCCReference Include="cAppPaths.pas"/>
+        <DCCReference Include="cPyScripterSettings.pas"/>
+        <DCCReference Include="cPySupportTypes.pas"/>
+        <DCCReference Include="cPyControl.pas"/>
+        <DCCReference Include="JvGnugettext.pas"/>
+        <DCCReference Include="cInternalPython.pas"/>
+        <DCCReference Include="dlgPythonVersions.pas">
+            <Form>PythonVersionsDialog</Form>
+        </DCCReference>
+        <DCCReference Include="cSSHSupport.pas"/>
+        <DCCReference Include="dlgRemoteFile.pas">
+            <Form>RemoteFileDialog</Form>
+        </DCCReference>
+        <DCCReference Include="cPySSHDebugger.pas"/>
+        <DCCReference Include="RtlVclFixes.pas"/>
+        <DCCReference Include="JvDockAdvTree.pas"/>
+        <DCCReference Include="JvDockSupportProc.pas"/>
+        <DCCReference Include="JvDockTree.pas"/>
+        <DCCReference Include="JvDockVSNetStyleSpTBX.pas"/>
+        <DCCReference Include="SynEditLsp.pas"/>
+        <DCCReference Include="uLLMSupport.pas"/>
+        <DCCReference Include="frmLLMChat.pas">
+            <Form>LLMChatForm</Form>
+        </DCCReference>
+        <DCCReference Include="frmSuggest.pas">
+            <Form>SuggestWindow</Form>
+        </DCCReference>
+        <DCCReference Include="cLSPClients.pas"/>
+        <DCCReference Include="uPythonItfs.pas"/>
+        <None Include="PyScripter.todo"/>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Source>
+                    <Source Name="MainSource">PyScripter.dpr</Source>
+                </Source>
+                <Excluded_Packages/>
+                <VersionInfo>
+                    <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+                    <VersionInfo Name="Debug">False</VersionInfo>
+                    <VersionInfo Name="PreRelease">False</VersionInfo>
+                    <VersionInfo Name="Special">False</VersionInfo>
+                    <VersionInfo Name="Private">False</VersionInfo>
+                    <VersionInfo Name="DLL">False</VersionInfo>
+                    <VersionInfo Name="Locale">2057</VersionInfo>
+                    <VersionInfo Name="CodePage">1252</VersionInfo>
+                </VersionInfo>
+                <VersionInfoKeys>
+                    <VersionInfoKeys Name="CompanyName"/>
+                    <VersionInfoKeys Name="FileDescription">PyScripter Python IDE</VersionInfoKeys>
+                    <VersionInfoKeys Name="FileVersion">2.4.4.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="InternalName"/>
+                    <VersionInfoKeys Name="LegalCopyright"/>
+                    <VersionInfoKeys Name="LegalTrademarks"/>
+                    <VersionInfoKeys Name="OriginalFilename"/>
+                    <VersionInfoKeys Name="ProductName">PyScripter</VersionInfoKeys>
+                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="Comments"/>
+                </VersionInfoKeys>
+                <Parameters>
+                    <Parameters Name="UseLauncher">False</Parameters>
+                    <Parameters Name="LoadAllSymbols">True</Parameters>
+                    <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+                </Parameters>
+            </Delphi.Personality>
+            <ModelSupport>False</ModelSupport>
+            <Platforms>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">True</Platform>
+            </Platforms>
+            <MMX>
+                <UsesClauseFormatter AutoFormat="0">
+                    <GroupNames>WinApi;System.Win;System;Data;Vcl</GroupNames>
+                </UsesClauseFormatter>
+            </MMX>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+    <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
+</Project>

From 33b10fb881560b58463aad2edbce84c3d7b6646a Mon Sep 17 00:00:00 2001
From: Idan Miara <idan@miara.com>
Date: Sun, 23 Nov 2025 19:23:16 +0200
Subject: [PATCH 4/5] Update .gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9a9fe8b7f..8d59327af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,6 @@ VirtualTreeView.zip
 *.chw
 /Lib/Lsp/jls/jedilsp
 /WebView2Loader.dll
-/Help/build
\ No newline at end of file
+/Help/build
+
+.idea
\ No newline at end of file

From acce61f93244182aab34cd6fdf7fd49fd2876e1b Mon Sep 17 00:00:00 2001
From: Idan Miara <idan@miara.com>
Date: Tue, 30 Dec 2025 22:43:52 +0200
Subject: [PATCH 5/5] update iss file for the new location of
 WebView2Loader.dll

---
 Install/PyScripter.iss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Install/PyScripter.iss b/Install/PyScripter.iss
index accdb8526..8afbc4fec 100644
--- a/Install/PyScripter.iss
+++ b/Install/PyScripter.iss
@@ -58,7 +58,7 @@ Source: ..\PyScripter.exe; DestDir: {app}; Flags: ignoreversion
 Source: ..\PyScripter.chm; DestDir: {app}; Flags: ignoreversion
 Source: ..\Source\PyProject.ico; DestDir: {app}
 Source: ..\Lib\rpyc.zip; DestDir: {app}\Lib
-Source: Dependencies\{#OSPlatform}\WebView2Loader.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\{#OSPlatform}\WebView2Loader.dll; DestDir: {app}; Flags: ignoreversion
 Source: Dependencies\MicrosoftEdgeWebview2Setup.exe; DestDir: "{commonappdata}\PyScripter"; Flags: ignoreversion
 ; localization
 Source: ..\locale\default.pot; DestDir: {app}\locale