diff --git a/Scripts/menu.py b/Scripts/menu.py
index eb84d18..952ec9a 100644
--- a/Scripts/menu.py
+++ b/Scripts/menu.py
@@ -203,7 +203,7 @@ def menu_tools():
{'Name': 'Fast Copy', 'Folder': 'FastCopy', 'File': 'FastCopy.exe', 'Args': ['/log', '/logfile=X:\WK\Info\FastCopy.log', '/cmd=noexist_only', '/utf8', '/skip_empty_dir', '/linkdest', '/open_window', '/balloon=FALSE', r'/exclude=$RECYCLE.BIN;$Recycle.Bin;.AppleDB;.AppleDesktop;.AppleDouble;.com.apple.timemachine.supported;.dbfseventsd;.DocumentRevisions-V100*;.DS_Store;.fseventsd;.PKInstallSandboxManager;.Spotlight*;.SymAV*;.symSchedScanLockxz;.TemporaryItems;.Trash*;.vol;.VolumeIcon.icns;desktop.ini;Desktop?DB;Desktop?DF;hiberfil.sys;lost+found;Network?Trash?Folder;pagefile.sys;Recycled;RECYCLER;System?Volume?Information;Temporary?Items;Thumbs.db']},
{'Name': 'HWiNFO', 'Folder': 'HWiNFO', 'File': 'HWiNFO.exe'},
{'Name': 'NT Password Editor', 'Folder': 'NT Password Editor', 'File': 'ntpwedit.exe'},
- {'Name': 'Notepad2', 'Folder': 'Notepad2', 'File': 'Notepad2-Mod.exe'},
+ {'Name': 'Notepad++', 'Folder': 'NotepadPlusPlus', 'File': 'notepadplusplus.exe'},
{'Name': 'PhotoRec', 'Folder': 'TestDisk', 'File': 'photorec_win.exe', 'Args': ['-new_console:n']},
{'Name': 'Prime95', 'Folder': 'Prime95', 'File': 'prime95.exe'},
{'Name': 'ProduKey', 'Folder': 'ProduKey', 'File': 'ProduKey.exe', 'Args': ['/external', '/ExtractEdition:1']},
diff --git a/WK/amd64/Notepad2/Notepad2.ini b/WK/amd64/Notepad2/Notepad2.ini
deleted file mode 100644
index b5c75f8..0000000
--- a/WK/amd64/Notepad2/Notepad2.ini
+++ /dev/null
@@ -1,106 +0,0 @@
-[Notepad2]
-[Settings]
-SaveSettings=1
-SaveRecentFiles=0
-SaveFindReplace=0
-CloseFind=0
-CloseReplace=0
-NoFindWrap=0
-OpenWithDir=%SystemDrive%\WK\Tools\.bin\Notepad2
-Favorites=%SystemDrive%\WK\Tools\.bin\Notepad2
-PathNameFormat=2
-WordWrap=1
-WordWrapMode=0
-WordWrapIndent=0
-WordWrapSymbols=22
-ShowWordWrapSymbols=0
-MatchBraces=1
-AutoCloseTags=0
-HighlightCurrentLine=1
-AutoIndent=1
-AutoCompleteWords=0
-ShowIndentGuides=0
-TabsAsSpaces=1
-TabIndents=1
-BackspaceUnindents=1
-TabWidth=4
-IndentWidth=0
-MarkLongLines=1
-LongLinesLimit=80
-LongLineMode=1
-ShowSelectionMargin=0
-ShowLineNumbers=1
-ShowCodeFolding=1
-MarkOccurrences=2
-MarkOccurrencesMatchCase=0
-MarkOccurrencesMatchWholeWords=0
-ViewWhiteSpace=0
-ViewEOLs=0
-DefaultEncoding=3
-SkipUnicodeDetection=0
-LoadASCIIasUTF8=0
-LoadNFOasOEM=1
-NoEncodingTags=0
-DefaultEOLMode=0
-FixLineEndings=0
-FixTrailingBlanks=0
-PrintHeader=1
-PrintFooter=0
-PrintColorMode=3
-PrintZoom=10
-PrintMarginLeft=1000
-PrintMarginTop=1000
-PrintMarginRight=1000
-PrintMarginBottom=1000
-SaveBeforeRunningTools=1
-FileWatchingMode=1
-ResetFileWatching=0
-EscFunction=2
-AlwaysOnTop=0
-MinimizeToTray=0
-TransparentMode=0
-ToolbarButtons=1 2 4 0 5 6 0 7 8 9 0 10 11 0 12 0 24 0 13 14 0 15 0 17
-ShowToolbar=1
-ShowStatusbar=1
-EncodingDlgSizeX=256
-EncodingDlgSizeY=262
-RecodeDlgSizeX=256
-RecodeDlgSizeY=262
-FileMRUDlgSizeX=412
-FileMRUDlgSizeY=376
-OpenWithDlgSizeX=384
-OpenWithDlgSizeY=386
-FavoritesDlgSizeX=334
-FavoritesDlgSizeY=316
-FindReplaceDlgPosX=0
-FindReplaceDlgPosY=0
-[Settings2]
-SingleFileInstance=1
-ShellAppUserModelID=Notepad2
-ShellUseSystemMRU=1
-[Recent Files]
-[Recent Find]
-[Recent Replace]
-[Custom Colors]
-01=#000000
-02=#0A246A
-03=#3A6EA5
-04=#003CE6
-05=#006633
-06=#608020
-07=#648000
-08=#A46000
-09=#FFFFFF
-10=#FFFFE2
-11=#FFF1A8
-12=#FFC000
-13=#FF4000
-14=#C80000
-15=#B000B0
-16=#B28B40
-[Styles]
-Use2ndDefaultStyle=0
-DefaultScheme=0
-AutoSelect=1
-SelectDlgSizeX=304
-SelectDlgSizeY=324
diff --git a/WK/amd64/NotepadPlusPlus/config.xml b/WK/amd64/NotepadPlusPlus/config.xml
new file mode 100644
index 0000000..3a88a83
--- /dev/null
+++ b/WK/amd64/NotepadPlusPlus/config.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+ standard
+ hide
+
+ vertical
+ hide
+
+ no
+ yes
+ no
+ no
+ yes
+ yes
+ no
+ yes
+
+
+
+
+ yes
+ yes
+ 2
+
+
+
+
+
+ hide
+
+
+
+
+
+
+
+
+
+ yes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WK/x86/Notepad2/Notepad2.ini b/WK/x86/Notepad2/Notepad2.ini
deleted file mode 100644
index b5c75f8..0000000
--- a/WK/x86/Notepad2/Notepad2.ini
+++ /dev/null
@@ -1,106 +0,0 @@
-[Notepad2]
-[Settings]
-SaveSettings=1
-SaveRecentFiles=0
-SaveFindReplace=0
-CloseFind=0
-CloseReplace=0
-NoFindWrap=0
-OpenWithDir=%SystemDrive%\WK\Tools\.bin\Notepad2
-Favorites=%SystemDrive%\WK\Tools\.bin\Notepad2
-PathNameFormat=2
-WordWrap=1
-WordWrapMode=0
-WordWrapIndent=0
-WordWrapSymbols=22
-ShowWordWrapSymbols=0
-MatchBraces=1
-AutoCloseTags=0
-HighlightCurrentLine=1
-AutoIndent=1
-AutoCompleteWords=0
-ShowIndentGuides=0
-TabsAsSpaces=1
-TabIndents=1
-BackspaceUnindents=1
-TabWidth=4
-IndentWidth=0
-MarkLongLines=1
-LongLinesLimit=80
-LongLineMode=1
-ShowSelectionMargin=0
-ShowLineNumbers=1
-ShowCodeFolding=1
-MarkOccurrences=2
-MarkOccurrencesMatchCase=0
-MarkOccurrencesMatchWholeWords=0
-ViewWhiteSpace=0
-ViewEOLs=0
-DefaultEncoding=3
-SkipUnicodeDetection=0
-LoadASCIIasUTF8=0
-LoadNFOasOEM=1
-NoEncodingTags=0
-DefaultEOLMode=0
-FixLineEndings=0
-FixTrailingBlanks=0
-PrintHeader=1
-PrintFooter=0
-PrintColorMode=3
-PrintZoom=10
-PrintMarginLeft=1000
-PrintMarginTop=1000
-PrintMarginRight=1000
-PrintMarginBottom=1000
-SaveBeforeRunningTools=1
-FileWatchingMode=1
-ResetFileWatching=0
-EscFunction=2
-AlwaysOnTop=0
-MinimizeToTray=0
-TransparentMode=0
-ToolbarButtons=1 2 4 0 5 6 0 7 8 9 0 10 11 0 12 0 24 0 13 14 0 15 0 17
-ShowToolbar=1
-ShowStatusbar=1
-EncodingDlgSizeX=256
-EncodingDlgSizeY=262
-RecodeDlgSizeX=256
-RecodeDlgSizeY=262
-FileMRUDlgSizeX=412
-FileMRUDlgSizeY=376
-OpenWithDlgSizeX=384
-OpenWithDlgSizeY=386
-FavoritesDlgSizeX=334
-FavoritesDlgSizeY=316
-FindReplaceDlgPosX=0
-FindReplaceDlgPosY=0
-[Settings2]
-SingleFileInstance=1
-ShellAppUserModelID=Notepad2
-ShellUseSystemMRU=1
-[Recent Files]
-[Recent Find]
-[Recent Replace]
-[Custom Colors]
-01=#000000
-02=#0A246A
-03=#3A6EA5
-04=#003CE6
-05=#006633
-06=#608020
-07=#648000
-08=#A46000
-09=#FFFFFF
-10=#FFFFE2
-11=#FFF1A8
-12=#FFC000
-13=#FF4000
-14=#C80000
-15=#B000B0
-16=#B28B40
-[Styles]
-Use2ndDefaultStyle=0
-DefaultScheme=0
-AutoSelect=1
-SelectDlgSizeX=304
-SelectDlgSizeY=324
diff --git a/WK/x86/NotepadPlusPlus/config.xml b/WK/x86/NotepadPlusPlus/config.xml
new file mode 100644
index 0000000..3a88a83
--- /dev/null
+++ b/WK/x86/NotepadPlusPlus/config.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+ standard
+ hide
+
+ vertical
+ hide
+
+ no
+ yes
+ no
+ no
+ yes
+ yes
+ no
+ yes
+
+
+
+
+ yes
+ yes
+ 2
+
+
+
+
+
+ hide
+
+
+
+
+
+
+
+
+
+ yes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/make.cmd b/make.cmd
index c12fb6d..1e47ff4 100644
--- a/make.cmd
+++ b/make.cmd
@@ -112,7 +112,7 @@ for %%a in (amd64 x86) do (
rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-StorageWMI_en-us.cab" /logpath:"dism.log"
rem Add Drivers
- dism /add-driver /image:"!mount!" /driver:"!drivers!" /recurse /logpath:"dism.log"
+ REM dism /add-driver /image:"!mount!" /driver:"!drivers!" /recurse /logpath:"dism.log"
rem Force RamDisk size to try and avoid capture-image errors
dism /image:"!mount!" /set-scratchspace:512
@@ -142,7 +142,7 @@ for %%a in (amd64 x86) do (
reg add "HKLM\WinPE-SYS\ControlSet001\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /d "%%SystemRoot%%\system32;%%SystemRoot%%;%%SystemRoot%%\System32\Wbem;%%SYSTEMROOT%%\System32\WindowsPowerShell\v1.0\;%%SystemDrive%%\WK\7-Zip;%%SystemDrive%%\WK\python;%%SystemDrive%%\WK\wimlib" /f
rem Replace Notepad
- reg add "HKLM\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /v Debugger /t REG_SZ /d "X:\WK\Notepad2\Notepad2-Mod.exe /z" /f
+ reg add "HKLM\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /v Debugger /t REG_SZ /d "X:\WK\NotepadPlusPlus\notepadplusplus.exe /z" /f
rem Unload registry hives
reg unload HKLM\WinPE-SW