diff --git a/Projects/PhoenixPE/Applications/Developer Tools/x64dbg.script b/Projects/PhoenixPE/Applications/Developer Tools/x64dbg.script
index acc1f73..bf7c071 100644
--- a/Projects/PhoenixPE/Applications/Developer Tools/x64dbg.script	
+++ b/Projects/PhoenixPE/Applications/Developer Tools/x64dbg.script	
@@ -35,8 +35,8 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
-Date=2020-05-27
+Version=1.1.0.0
+Date=2024-11-09
 
 [Variables]
 %ProgramFolder%="x64dbg"
@@ -86,8 +86,31 @@ Else,Set,%Theme%,"Default"
 IniWrite,"%TargetPrograms%\%ProgramFolder%\x32\x32dbg.ini","Theme","Selected",%Theme%
 IniWrite,"%TargetPrograms%\%ProgramFolder%\x64\x64dbg.ini","Theme","Selected",%Theme%
 
-If,%cb_RegisterShellExt%,Equal,True,Begin
 RegLoadHives
+
+// JIT debugger
+If,%cb_SetAsDebugger%,Equal,True,Begin
+  // Auto Debug
+  If,%cb_AutoStartDebugger%,Equal,True,Begin
+    RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",1
+	If,%SourceArch%,Equal,x64,RegWrite,HKLM,0x1,"Tmp_Software\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",1
+  End
+  Else,Begin
+    RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",0
+    If,%SourceArch%,Equal,x64,RegWrite,HKLM,0x1,"Tmp_Software\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",0
+  End
+  // Set as debugger
+  RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows NT\CurrentVersion\AeDebug","Debugger","#$q%PEPrograms%\%ProgramFolder%\%SourceArch%\x64dbg.exe#$q -a #$pld -e #$pld"
+  If,%SourceArch%,Equal,x64,RegWrite,HKLM,0x1,"Tmp_Software\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug","Debugger","#$q%PEPrograms%\%ProgramFolder%\x86\x64dbg.exe#$q -a #$pld -e #$pld"
+End
+Else,Begin
+  RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows\CurrentVersion\AeDebug","Auto",0
+  If,%SourceArch%,Equal,x64,RegWrite,HKLM,0x1,"Tmp_Software\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",0
+  RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows NT\CurrentVersion\AeDebug","Debugger",""
+  If,%SourceArch%,Equal,x64,RegWrite,HKLM,0x1,"Tmp_Software\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug","Debugger",""
+End
+
+If,%cb_RegisterShellExt%,Equal,True,Begin
 // Database Icons
 RegWrite,HKLM,0x1,"Tmp_Software\Classes\.dd32","","x64dbg_db"
 RegWrite,HKLM,0x2,"Tmp_Software\Classes\.dd32\DefaultIcon","","#$q%PEPrograms%\%ProgramFolder%\x32\x32dbg.exe"
@@ -101,9 +124,10 @@ RegWrite,HKLM,0x2,"Tmp_Software\Classes\dllfile\shell\Debug with x64dbg\DefaultI
 RegWrite,HKLM,0x1,"Tmp_Software\Classes\exefile\shell\Debug with x64dbg","","Debug with x64dbg"
 RegWrite,HKLM,0x1,"Tmp_Software\Classes\exefile\shell\Debug with x64dbg\command","","#$q%PEPrograms%\%ProgramFolder%\%ProgramExe%#$q #$q%1#$q"
 RegWrite,HKLM,0x2,"Tmp_Software\Classes\exefile\shell\Debug with x64dbg\DefaultIcon","","#$q%PEPrograms%\%ProgramFolder%\%ProgramExe%#$q#$c0"
-RegUnloadHives
 End
 
+RegUnloadHives
+
 ///////////////////////////////////////////////////////////////////////////////////
 // Shortcuts
 
@@ -199,6 +223,8 @@ WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AutoRun,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_RegisterShellExt,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_DarkTheme,False
+WriteInterface,Value,%ScriptFile%,Interface,cb_SetAsDebugger,False
+WriteInterface,Value,%ScriptFile%,Interface,cb_AutoStartDebugger,False
 System,Cursor,Normal
 
 [#ToggleAdvancedOptions#]
@@ -263,8 +289,10 @@ bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
 cmb_Language=English,1,4,160,126,150,21,Afrikaans,Arabic,Bulgarian,Bosnian,Catalan,Cebuano,"Chinese (Simplified)","Chinese (Traditional)",Czech,Danish,Dutch,English,Filipino,Finnish,French,German,Georgian,Greek,Hebrew,Hindi,Hungarian,Indonesian,Italian,Japanese,Korean,Norwegian,Persian,Polish,"Portuguese (Brazil)","Portuguese (Portugal)",Romanian,Russian,Slovenian,Serbian,Spanish,Swedish,Thai,Turkish,Ukrainian,Vietnamese
 cb_AutoRun="Launch x64dbg at boot",1,3,160,154,181,18,False,"__Select this option to automatically launch x64dbgwhen your PE boots.#$x#$xUseful for developers."
-cb_RegisterShellExt="Register Shell Extension",1,3,160,175,179,18,False
-cb_DarkTheme="Use Dark Theme",1,3,160,196,180,18,False
+cb_RegisterShellExt="Register shell extension",1,3,160,175,179,18,False
+cb_DarkTheme="Use dark theme",1,3,160,196,180,18,False
+cb_SetAsDebugger="Set x64dbg as JIT debugger",1,3,160,217,180,18,False
+cb_AutoStartDebugger="Auto debug",1,3,180,237,155,18,False,"__If this option is enabled the postmortem debugger is immediately launched when an exception is thrown."
 
 [InterfaceEncoded]
 play-hot.png=841,1220