diff --git a/Projects/PhoenixPE/Applications/File Managers/7Zip.script b/Projects/PhoenixPE/Applications/File Managers/7Zip.script
index 88ac4b3..06c8d85 100644
--- a/Projects/PhoenixPE/Applications/File Managers/7Zip.script	
+++ b/Projects/PhoenixPE/Applications/File Managers/7Zip.script	
@@ -32,16 +32,16 @@
 Title=7-Zip
 Author=Homes32
 Level=5
-Version=1.1.1.0
-Description=(v21.07) 7-Zip is a free and open-source file archiver capable of reading and writing many archive formats.
-Date=2022-01-07
+Version=1.1.2.0
+Description=(v22.00) 7-Zip is a free and open-source file archiver capable of reading and writing many archive formats.
+Date=2022-06-22
 Selected=False
 Mandatory=False
 
 [Variables]
 %ProgramFolder%="7-Zip"
 %ProgramExe%="7zFM.exe"
-%ProgramVersion%=2107
+%ProgramVersion%=2200
 %DownloadURL86%=https://www.7-zip.org/a/7z%ProgramVersion%.exe
 %DownloadURL64%=https://www.7-zip.org/a/7z%ProgramVersion%-x64.exe
 
@@ -441,8 +441,7 @@ DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
 // ===============================================================================================================================
 [LaunchProgram]
 System,SetLocal
-System,GetEnv,PROCESSOR_ARCHITECTURE,%HostArch%
-If,%HostArch%,Equal,AMD64,Set,%SetupFile%,Setup-x64.exe
+If,%HostArch%,Equal,x64,Set,%SetupFile%,Setup-x64.exe
 Else,Set,%SetupFile%,Setup-x86.exe
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q * -xr!uninstall.exe -o#$q%ProjectTemp%\%ProgramFolder%#$q"
diff --git a/Projects/PhoenixPE/Components/310-Networking.script b/Projects/PhoenixPE/Components/310-Networking.script
index a4ebb09..3e0fb68 100644
--- a/Projects/PhoenixPE/Components/310-Networking.script
+++ b/Projects/PhoenixPE/Components/310-Networking.script
@@ -36,8 +36,8 @@ Author=Homes32
 Level=4
 Selected=True
 Mandatory=False
-Version=1.6.1.0
-Date=2022-02-06
+Version=1.6.2.0
+Date=2022-06-25
 
 [Variables]
 %ProgramFolder%="PENetwork"
@@ -205,13 +205,14 @@ If,%cb_EnableRNDIS%,Equal,True,Begin
   RequireFileEx,AppendList,\Windows\System32\drivers\usb8023.sys
   
   RequireDriver,netrndis.inf
+  RequireDriver,netvwifimp.inf
   RequireDriver,rndiscmp.inf
   RequireDriver,wceisvista.inf
 
 End
 
 ///////////////////////////////////////////////////////////////////////////////////
-// Drivers
+// Drivers (This section could use some cleanup.)
 RequireFileEx,AppendList,\Windows\INF\netlldp.inf
 RequireFileEx,AppendList,\Windows\INF\ndiscap.inf
 RequireFileEx,AppendList,\Windows\INF\netnwifi.inf
diff --git a/Projects/PhoenixPE/Shell/001-Explorer.script b/Projects/PhoenixPE/Shell/001-Explorer.script
index 9300659..dd36485 100644
--- a/Projects/PhoenixPE/Shell/001-Explorer.script
+++ b/Projects/PhoenixPE/Shell/001-Explorer.script
@@ -624,6 +624,8 @@ RequireFileEx,AppendList,\Windows\System32\Windows.Globalization.dll
 RequireFileEx,AppendList,\Windows\System32\Windows.Internal.Shell.Broker.dll
 RequireFileEx,AppendList,\Windows\System32\Windows.Networking.Connectivity.dll
 RequireFileEx,AppendList,\Windows\System32\Windows.UI.dll
+If,%SourceVer%,Bigger,10.0.22000.318,RequireFileEx,AppendList,\Windows\System32\Windows.UI.Core.TextInput.dll
+If,%SourceVer%,Bigger,10.0.22000.318,RequireFileEx,AppendList,\Windows\System32\windowsudk.shellcommon.dll
 
 If,%SourceVer%,BiggerEqual,10.0.18900.0,Begin
   // Windows Management
@@ -1058,7 +1060,7 @@ cb_ExpandOpStatusDlg="Expand Operation Status",1,3,160,145,200,18,True,"__Expand
 cb_ShowHiddenFiles="Show Hidden & System Files",1,3,160,97,200,18,True
 bvl_Win11Support="Win11 Support",1,12,151,275,403,94,8,Bold
 lbl_Win11Explorer="This option will only be processed if building from a Win11 source.",1,1,160,290,380,16,8,Normal
-cmb_Win10ExplorerSource="Use explorer.exe from the Win11 source image",1,4,160,310,311,21,"Use explorer.exe from the Win11 source image","Use explorer.exe from my Win10 host","Extract explorer.exe from a Win10 ISO","Use the explorer.exe application provided below",_ToggleWin10ExplorerSource_,True
+cmb_Win10ExplorerSource="Use explorer.exe from my Win10 host",1,4,160,310,311,21,"Use explorer.exe from the Win11 source image","Use explorer.exe from my Win10 host","Extract explorer.exe from a Win10 ISO","Use the explorer.exe application provided below",_ToggleWin10ExplorerSource_,True
 web_WhatIsThis="What is this?",1,10,480,312,67,18,https://github.com/PhoenixPE/PhoenixPE/wiki/FAQ#building-from-a-win11-source-with-explorer-shell-causes-blackscreen-on-boot
 pb_Win10ExplorerEXE=,0,20,160,340,380,20,file,"Title=Select the explorer.exe to include in your build",Filter=explorer.exe|explorer.exe,"__Select the explorer.exe to include in your build"
 pb_Win10ExplorerWIM=,0,20,160,340,329,20,dir,"Title=Select the directory containing your extracted Win10 ISO image.",_CheckWin10ExplorerSource_,True,"__Select the directory containing your extracted Win10 ISO image."