diff --git a/Assets/Menus/Info b/Assets/Menus/Info index 3fe7466..16cc4de 100755 --- a/Assets/Menus/Info +++ b/Assets/Menus/Info @@ -36,6 +36,7 @@ File Explorer - Change the default location that File Explorer opens to. - Show hidden files, folders and drives. - Show file extensions for known file types. +- Add all common folders (Desktop, Downloads, Etc.) back to 'This PC' in File Explorer. (W11 only) - Hide the Home or Gallery section from the File Explorer navigation pane. (W11 only) - Hide the 3D objects, music or OneDrive folder from the File Explorer navigation pane. (W10 only) - Hide duplicate removable drive entries from the File Explorer navigation pane. diff --git a/DefaultSettings.json b/DefaultSettings.json index 046f5db..875ba25 100644 --- a/DefaultSettings.json +++ b/DefaultSettings.json @@ -209,6 +209,10 @@ "Name": "ExplorerToOneDrive", "Value": false }, + { + "Name": "AddFoldersToThisPC", + "Value": false + }, { "Name": "HideHome", "Value": false diff --git a/Get.ps1 b/Get.ps1 index c48bc5b..8c4342c 100644 --- a/Get.ps1 +++ b/Get.ps1 @@ -4,6 +4,7 @@ param ( [switch]$Sysprep, [string]$LogPath, [string]$User, + [switch]$NoRestartExplorer, [switch]$CreateRestorePoint, [switch]$RunAppsListGenerator, [switch]$RunAppConfigurator, [switch]$RunDefaults, @@ -66,7 +67,7 @@ param ( [switch]$ExplorerToThisPC, [switch]$ExplorerToDownloads, [switch]$ExplorerToOneDrive, - [switch]$NoRestartExplorer, + [switch]$AddFoldersToThisPC, [switch]$DisableOnedrive, [switch]$HideOnedrive, [switch]$Disable3dObjects, [switch]$Hide3dObjects, [switch]$DisableMusic, [switch]$HideMusic, diff --git a/README.md b/README.md index 266725c..556e35c 100755 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ Below is an overview of the key features and functionality offered by Win11Deblo - Change the default location that File Explorer opens to. - Show hidden files, folders and drives. - Show file extensions for known file types. +- Add all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer. (W11 only) - Hide the Home or Gallery section from the File Explorer navigation pane. (W11 only) - Hide the 3D objects, music or OneDrive folder from the File Explorer navigation pane. (W10 only) - Hide duplicate removable drive entries from the File Explorer navigation pane, so only the entry under 'This PC' remains. diff --git a/Regfiles/Add_All_Folders_Under_This_PC.reg b/Regfiles/Add_All_Folders_Under_This_PC.reg new file mode 100644 index 0000000..df51f97 --- /dev/null +++ b/Regfiles/Add_All_Folders_Under_This_PC.reg @@ -0,0 +1,46 @@ +Windows Registry Editor Version 5.00 + +; Desktop +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}] +"HiddenByDefault"=dword:00000000 + +; Documents +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}] +"HiddenByDefault"=dword:00000000 + +; Downloads +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}] +"HiddenByDefault"=dword:00000000 + +; Music +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{1CF1260C-4DD0-4ebb-811F-33C572699FDE}] +"HiddenByDefault"=dword:00000000 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}] +"HiddenByDefault"=dword:00000000 + +; Pictures +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}] +"HiddenByDefault"=dword:00000000 + +; Videos +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}] +"HiddenByDefault"=dword:00000000 \ No newline at end of file diff --git a/Regfiles/Sysprep/Add_All_Folders_Under_This_PC.reg b/Regfiles/Sysprep/Add_All_Folders_Under_This_PC.reg new file mode 100644 index 0000000..df51f97 --- /dev/null +++ b/Regfiles/Sysprep/Add_All_Folders_Under_This_PC.reg @@ -0,0 +1,46 @@ +Windows Registry Editor Version 5.00 + +; Desktop +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}] +"HiddenByDefault"=dword:00000000 + +; Documents +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}] +"HiddenByDefault"=dword:00000000 + +; Downloads +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}] +"HiddenByDefault"=dword:00000000 + +; Music +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{1CF1260C-4DD0-4ebb-811F-33C572699FDE}] +"HiddenByDefault"=dword:00000000 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}] +"HiddenByDefault"=dword:00000000 + +; Pictures +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}] +"HiddenByDefault"=dword:00000000 + +; Videos +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}] +"HideIfEnabled"=- + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}] +"HiddenByDefault"=dword:00000000 \ No newline at end of file diff --git a/Regfiles/Undo/Remove_All_Folders_Under_This_PC.reg b/Regfiles/Undo/Remove_All_Folders_Under_This_PC.reg new file mode 100644 index 0000000..dc46705 --- /dev/null +++ b/Regfiles/Undo/Remove_All_Folders_Under_This_PC.reg @@ -0,0 +1,46 @@ +Windows Registry Editor Version 5.00 + +; Desktop +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}] +"HideIfEnabled"=dword:022ab9b9 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}] +"HiddenByDefault"=dword:00000001 + +; Documents +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}] +"HideIfEnabled"=dword:022ab9b9 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{d3162b92-9365-467a-956b-92703aca08af}] +"HiddenByDefault"=dword:00000001 + +; Downloads +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}] +"HideIfEnabled"=dword:022ab9b9 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{088e3905-0323-4b02-9826-5d99428e115f}] +"HiddenByDefault"=dword:00000001 + +; Music +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}] +"HideIfEnabled"=dword:022ab9b9 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{1CF1260C-4DD0-4ebb-811F-33C572699FDE}] +"HiddenByDefault"=dword:00000001 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}] +"HiddenByDefault"=dword:00000001 + +; Pictures +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}] +"HideIfEnabled"=dword:022ab9b9 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{24ad3ad4-a569-4530-98e1-ab02f9417aa8}] +"HiddenByDefault"=dword:00000001 + +; Videos +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}] +"HideIfEnabled"=dword:022ab9b9 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}] +"HiddenByDefault"=dword:00000001 \ No newline at end of file diff --git a/Win11Debloat.ps1 b/Win11Debloat.ps1 index e67cf73..2c66b02 100755 --- a/Win11Debloat.ps1 +++ b/Win11Debloat.ps1 @@ -6,6 +6,7 @@ param ( [switch]$Sysprep, [string]$LogPath, [string]$User, + [switch]$NoRestartExplorer, [switch]$CreateRestorePoint, [switch]$RunAppsListGenerator, [switch]$RunAppConfigurator, [switch]$RunDefaults, @@ -68,7 +69,7 @@ param ( [switch]$ExplorerToThisPC, [switch]$ExplorerToDownloads, [switch]$ExplorerToOneDrive, - [switch]$NoRestartExplorer, + [switch]$AddFoldersToThisPC, [switch]$HideOnedrive, [switch]$DisableOnedrive, [switch]$Hide3dObjects, [switch]$Disable3dObjects, [switch]$HideMusic, [switch]$DisableMusic, @@ -110,7 +111,7 @@ $script:Features = @{ "HideChat" = "Hide the chat (meet now) icon from the taskbar (Windows 10 only)" "ShowKnownFileExt" = "Show file extensions for known file types" "DisableFastStartup" = "Disable Fast Start-up" - "Hide3dObjects" = "Hide the 3D objects folder under 'This pc' in File Explorer (Windows 10 only)" + "Hide3dObjects" = "Hide the 3D objects folder under 'This PC' in File Explorer (Windows 10 only)" "DisableModernStandbyNetworking" = "Disable network connectivity during Modern Standby (If supported)" "DisableDVR" = "Disable Xbox game/screen recording" "DisableGameBarIntegration" = "Disable Game Bar integration" @@ -152,6 +153,7 @@ $script:Features = @{ "ExplorerToThisPC" = "Change the default location that File Explorer opens to 'This PC'" "ExplorerToDownloads" = "Change the default location that File Explorer opens to 'Downloads'" "ExplorerToOneDrive" = "Change the default location that File Explorer opens to 'OneDrive'" + "AddFoldersToThisPC" = "Add all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer" "HideHome" = "Hide the Home section from the File Explorer sidepanel (Windows 11 only)" "HideGallery" = "Hide the Gallery section from the File Explorer sidepanel (Windows 11 only)" "HideDupliDrive" = "Hide duplicate removable drive entries from the File Explorer sidepanel" @@ -162,7 +164,7 @@ $script:Features = @{ "HideGiveAccessTo" = "Hide the 'Give access to' option in the context menu (Windows 10 only)" "HideShare" = "Hide the 'Share' option in the context menu (Windows 10 only)" "HideOnedrive" = "Hide the OneDrive folder in the File Explorer sidepanel (Windows 10 only)" - "HideMusic" = "Hide the music folder under 'This pc' in File Explorer (Windows 10 only)" + "HideMusic" = "Hide the music folder under 'This PC' in File Explorer (Windows 10 only)" } # Check if current powershell environment is limited by security policies @@ -1568,59 +1570,6 @@ function ShowCustomModeOptions { AddParameter 'TaskbarAlignLeft' } - # Show options for combine icon on taskbar, only continue on valid input - Do { - Write-Output "" - Write-Host " Options:" -ForegroundColor Yellow - Write-Host " (n) No change" -ForegroundColor Yellow - Write-Host " (1) Always" -ForegroundColor Yellow - Write-Host " (2) When taskbar is full" -ForegroundColor Yellow - Write-Host " (3) Never" -ForegroundColor Yellow - $TbCombineTaskbar = Read-Host " Combine taskbar buttons and hide labels? (n/1/2/3)" - } - while ($TbCombineTaskbar -ne 'n' -and $TbCombineTaskbar -ne '0' -and $TbCombineTaskbar -ne '1' -and $TbCombineTaskbar -ne '2' -and $TbCombineTaskbar -ne '3') - - # Select correct taskbar goup option based on user input - switch ($TbCombineTaskbar) { - '1' { - AddParameter 'CombineTaskbarAlways' - AddParameter 'CombineMMTaskbarAlways' - } - '2' { - AddParameter 'CombineTaskbarWhenFull' - AddParameter 'CombineMMTaskbarWhenFull' - } - '3' { - AddParameter 'CombineTaskbarNever' - AddParameter 'CombineMMTaskbarNever' - } - } - - # Show options for changing on what taskbar(s) app icons are shown, only continue on valid input - Do { - Write-Output "" - Write-Host " Options:" -ForegroundColor Yellow - Write-Host " (n) No change" -ForegroundColor Yellow - Write-Host " (1) Show app icons on all taskbars" -ForegroundColor Yellow - Write-Host " (2) Show app icons on main taskbar and on taskbar where the windows is open" -ForegroundColor Yellow - Write-Host " (3) Show app icons only on taskbar where the window is open" -ForegroundColor Yellow - $TbCombineTaskbar = Read-Host " Change how to show app icons on the taskbar when using multiple monitors? (n/1/2/3)" - } - while ($TbCombineTaskbar -ne 'n' -and $TbCombineTaskbar -ne '0' -and $TbCombineTaskbar -ne '1' -and $TbCombineTaskbar -ne '2' -and $TbCombineTaskbar -ne '3') - - # Select correct taskbar goup option based on user input - switch ($TbCombineTaskbar) { - '1' { - AddParameter 'MMTaskbarModeAll' - } - '2' { - AddParameter 'MMTaskbarModeMainActive' - } - '3' { - AddParameter 'MMTaskbarModeActive' - } - } - # Show options for search icon on taskbar, only continue on valid input Do { Write-Output "" @@ -1682,9 +1631,66 @@ function ShowCustomModeOptions { } Write-Output "" + if ($( Read-Host -Prompt " Enable the 'Last Active Click' behavior in the taskbar app area? (y/n)" ) -eq 'y') { AddParameter 'EnableLastActiveClick' } + + # Only show these specific options for Windows 11 users running build 22000 or later + if ($WinVersion -ge 22000) { + # Show options for combine icon on taskbar, only continue on valid input + Do { + Write-Output "" + Write-Host " Options:" -ForegroundColor Yellow + Write-Host " (n) No change" -ForegroundColor Yellow + Write-Host " (1) Always" -ForegroundColor Yellow + Write-Host " (2) When taskbar is full" -ForegroundColor Yellow + Write-Host " (3) Never" -ForegroundColor Yellow + $TbCombineTaskbar = Read-Host " Combine taskbar buttons and hide labels? (n/1/2/3)" + } + while ($TbCombineTaskbar -ne 'n' -and $TbCombineTaskbar -ne '0' -and $TbCombineTaskbar -ne '1' -and $TbCombineTaskbar -ne '2' -and $TbCombineTaskbar -ne '3') + + # Select correct taskbar goup option based on user input + switch ($TbCombineTaskbar) { + '1' { + AddParameter 'CombineTaskbarAlways' + AddParameter 'CombineMMTaskbarAlways' + } + '2' { + AddParameter 'CombineTaskbarWhenFull' + AddParameter 'CombineMMTaskbarWhenFull' + } + '3' { + AddParameter 'CombineTaskbarNever' + AddParameter 'CombineMMTaskbarNever' + } + } + + # Show options for changing on what taskbar(s) app icons are shown, only continue on valid input + Do { + Write-Output "" + Write-Host " Options:" -ForegroundColor Yellow + Write-Host " (n) No change" -ForegroundColor Yellow + Write-Host " (1) Show app icons on all taskbars" -ForegroundColor Yellow + Write-Host " (2) Show app icons on main taskbar and on taskbar where the windows is open" -ForegroundColor Yellow + Write-Host " (3) Show app icons only on taskbar where the window is open" -ForegroundColor Yellow + $TbCombineTaskbar = Read-Host " Change how to show app icons on the taskbar when using multiple monitors? (n/1/2/3)" + } + while ($TbCombineTaskbar -ne 'n' -and $TbCombineTaskbar -ne '0' -and $TbCombineTaskbar -ne '1' -and $TbCombineTaskbar -ne '2' -and $TbCombineTaskbar -ne '3') + + # Select correct taskbar goup option based on user input + switch ($TbCombineTaskbar) { + '1' { + AddParameter 'MMTaskbarModeAll' + } + '2' { + AddParameter 'MMTaskbarModeMainActive' + } + '3' { + AddParameter 'MMTaskbarModeActive' + } + } + } } Write-Output "" @@ -1735,6 +1741,12 @@ function ShowCustomModeOptions { if ($WinVersion -ge 22000) { Write-Output "" + if ($( Read-Host -Prompt " Add all common folders (Desktop, Downloads, etc.) back to 'This PC' in File Explorer? (y/n)" ) -eq 'y') { + AddParameter 'AddFoldersToThisPC' + } + + Write-Output "" + if ($( Read-Host -Prompt " Hide the Home section from the File Explorer sidepanel? (y/n)" ) -eq 'y') { AddParameter 'HideHome' } @@ -1748,7 +1760,7 @@ function ShowCustomModeOptions { Write-Output "" - if ($( Read-Host -Prompt " Hide duplicate removable drive entries from the File Explorer sidepanel so they only show under This PC? (y/n)" ) -eq 'y') { + if ($( Read-Host -Prompt " Hide duplicate removable drive entries from the File Explorer sidepanel so they only show under 'This PC'? (y/n)" ) -eq 'y') { AddParameter 'HideDupliDrive' } @@ -2345,6 +2357,10 @@ switch ($script:Params.Keys) { RegImport "> Enabling file extensions for known file types..." "Show_Extensions_For_Known_File_Types.reg" continue } + 'AddFoldersToThisPC' { + RegImport "> Adding all common folders (Desktop, Downloads, etc.) back to `This PC` in File Explorer..." "Add_All_Folders_Under_This_PC.reg" + continue + } 'HideHome' { RegImport "> Hiding the home section from the File Explorer navigation pane..." "Hide_Home_from_Explorer.reg" continue