Merge pull request #5 from kyaulabs/feature/kyau-a50d-icon-update

Windows 11 Build 22621.819

Author: kyau

.gitignore

@@ -0,0 +1,5 @@
+Resources/Icons/Apps
+Resources/Icons/Hardware
+Resources/Icons/Places
+Resources/Icons/Start
+Resources/Icons/convert.bat

Modules/_funcs.ps1

@@ -164,7 +164,7 @@ function Add-Shortcut {
         [string] $Target,
         [Parameter(Mandatory=$false)]
         [ValidateNotNull()]
-        [string] $IconName = "",
+        [string] $Icon = "",
         [Parameter(Mandatory=$false)]
         [ValidateNotNull()]
         [string] $Arguments = "",
@@ -183,8 +183,8 @@ function Add-Shortcut {
     $Shortcut.TargetPath = $Target
     $Shortcut.Arguments = $Arguments
 
-    if ([bool]$IconName) {
-        $Shortcut.IconLocation = "${Env:ProgramData}\Windows Icons\Apps\" + $IconName + ".ico,0"
+    if ([bool]$Icon) {
+        $Shortcut.IconLocation = "${Env:ProgramData}\" + $Icon
     } else {
         $Shortcut.IconLocation = $Target + ",0"
     }
@@ -210,7 +210,7 @@ function Set-UserFolderIcon {
     $file = "${Env:USERPROFILE}\${Name}\desktop.ini"
     ATTRIB -H -S $file
     $find = "IconResource=%SystemRoot%\\system32\\imageres.dll,-${ImageRes}"
-    $replace = "IconResource=%ProgramData%\Windows Icons\${Icon}.ico"
+    $replace = "IconResource=%ProgramData%\win11tweak-places.dll,${Icon}"
     Get-Content $file | ForEach-Object{$_ -Replace $find,$replace} | Out-File ${file}2
     Move-Item -Path "${file}2" -Destination "$file" -Force
     ATTRIB +H +S $file
@@ -224,9 +224,6 @@ function Add-UserFolderIcon {
         [string] $Name,
         [Parameter(Mandatory=$true)]
         [ValidateNotNullOrEmpty()]
-        [string] $Icon,
-        [Parameter(Mandatory=$false)]
-        [ValidateNotNullOrEmpty()]
         [int] $ImageRes
     )
 
@@ -236,8 +233,7 @@ function Add-UserFolderIcon {
     $File = "${Name}\desktop.ini"
     $Text = @"
 [.ShellClassInfo]
-IconIndex=0
-IconResource=%ProgramData%\Windows Icons\${Icon},${ImageRes}
+IconResource=%ProgramData%\win11tweak-places.dll,${ImageRes}
 ConfirmFileOp=0
 DefaultDropEffect=1
 "@
@@ -292,7 +288,7 @@ function Show-Package {
 
 function Find-GitRelease {
     # PSScriptAnalyzer - ignore unused variables
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseDeclaredVarsMoreThanAssignments", "", Justification = "False positive because variable is used inside of Where-Object.")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSReviewUnusedParameter", "Search", Justification = "False positive because variable is used inside of Where-Object.")]
     [CmdletBinding()]
     param (
         [Parameter(Mandatory=$true)]
@@ -301,8 +297,8 @@ function Find-GitRelease {
         [string] $Search
     )
 
-    $URI = "https://api.github.com/repos/${Repo}/releases/latest"
-    $Match = $Search
-    Return Invoke-RestMethod -uri $URI | Select-Object -ExpandProperty assets | Where-Object { $_.name -Match $Match } | Select-Object -expand browser_download_url
+    $URI = "https://api.github.com/repos/${Repo}/releases"
+    $Match = Invoke-RestMethod -uri $URI
+    $Match[0] | Select-Object -ExpandProperty assets | Where-Object { $_.name -Match $Search } | Select-Object -expand browser_download_url
 }
 

Modules/apps.ps1

@@ -28,7 +28,7 @@
 
 Show-Section -Section "Apps" -Desc "Remove Bloated Defaults"
 
-$Whitelist = 'Microsoft.DesktopAppInstaller|Microsoft.GetHelp|Microsoft.MicrosoftSolitaireCollection|Microsoft.Paint|Microsoft.WindowsNotepad|Microsoft.WindowsTerminal'
+$Whitelist = 'Microsoft.DesktopAppInstaller|Microsoft.GetHelp|Microsoft.MicrosoftSolitaireCollection|Microsoft.Net.Native*|Microsoft.Paint|Microsoft.WindowsNotepad|Microsoft.WindowsTerminal'
 $NonRemovable = 'Microsoft.549981C3F5F10|Microsoft.MicrosoftEdge.Stable|Microsoft.StorePurchaseApp|Microsoft.UI*|Microsoft.VCLibs*|Microsoft.Windows.FilePicker*|Microsoft.WindowsStore'
 # remove app packages
 $remove = Get-AppxPackage -AllUsers | Where-Object {$_.Name -NotMatch $Whitelist -and $_.Name -NotMatch $NonRemovable}

Modules/cleanup.ps1

@@ -27,41 +27,52 @@
 #. "${PSScriptRoot}\_funcs.ps1"
 
 Show-Section -Section "Icons" -Desc "Copying Icon Theme"
-New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Start" | Out-Null
+<#
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Apps" | Out-Null
-Copy-Item ${PSScriptRoot}\..\Resources\Icons\*.ico -Destination "${Env:ProgramData}\Windows Icons\" -Force | Out-Null
-Copy-Item ${PSScriptRoot}\..\Resources\Icons\start\*.ico -Destination "${Env:ProgramData}\Windows Icons\Start\" -Force | Out-Null
-Copy-Item ${PSScriptRoot}\..\Resources\Icons\apps\*.ico -Destination "${Env:ProgramData}\Windows Icons\Apps\" -Force | Out-Null
+New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Emblems" | Out-Null
+New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Hardware" | Out-Null
+New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Mimetypes" | Out-Null
+New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Places" | Out-Null
+New-Item -Type Directory -Path "${Env:ProgramData}\Windows Icons\Start" | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\Apps\*.ico -Destination "${Env:ProgramData}\Windows Icons\Apps\" -Force | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\Emblems\*.ico -Destination "${Env:ProgramData}\Windows Icons\Emblems\" -Force | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\Hardware\*.ico -Destination "${Env:ProgramData}\Windows Icons\Hardware\" -Force | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\Mimetypes\*.ico -Destination "${Env:ProgramData}\Windows Icons\Mimetypes\" -Force | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\Places\*.ico -Destination "${Env:ProgramData}\Windows Icons\Places\" -Force | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\Start\*.ico -Destination "${Env:ProgramData}\Windows Icons\Start\" -Force | Out-Null
+#>
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\*.dll -Destination "${Env:ProgramData}" -Force | Out-Null
+Copy-Item ${PSScriptRoot}\..\Resources\Icons\*.ico -Destination "${Env:ProgramData}" -Force | Out-Null
 
 Show-Section -Section "Icons" -Desc "System Icons"
 # youtube-dl
 New-Item -ItemType SymbolicLink -Path "${Env:ProgramData}\chocolatey\lib\mpv.install\tools\yt-dlp.exe" -Target "${Env:ProgramData}\chocolatey\lib\yt-dlp\tools\x64\yt-dlp.exe" | Out-Null
 
 # User Folders
-Set-UserFolderIcon -Name "Contacts" -ImageRes 181 -Icon "folder-contacts"
-Set-UserFolderIcon -Name "Desktop" -ImageRes 183 -Icon "desktop"
-Set-UserFolderIcon -Name "Documents" -ImageRes 112 -Icon "folder-documents"
-Set-UserFolderIcon -Name "Downloads" -ImageRes 184 -Icon "folder-downloads"
-Set-UserFolderIcon -Name "Favorites" -ImageRes 115 -Icon "folder-favorites"
-Set-UserFolderIcon -Name "Links" -ImageRes 185 -Icon "folder-links"
-Set-UserFolderIcon -Name "Music" -ImageRes 108 -Icon "folder-music"
-Set-UserFolderIcon -Name "Pictures" -ImageRes 113 -Icon "folder-pictures"
-Set-UserFolderIcon -Name "Saved Games" -ImageRes 186 -Icon "folder-games"
-Set-UserFolderIcon -Name "Searches" -ImageRes 18 -Icon "folder-searches"
-Set-UserFolderIcon -Name "Videos" -ImageRes 189 -Icon "folder-videos"
+Set-UserFolderIcon -Name "Contacts" -ImageRes 181 -Icon 73 #"folder-blue-public"
+Set-UserFolderIcon -Name "Desktop" -ImageRes 183 -Icon 52 #"folder-blue-desktop"
+Set-UserFolderIcon -Name "Documents" -ImageRes 112 -Icon 54 #"folder-blue-documents"
+Set-UserFolderIcon -Name "Downloads" -ImageRes 184 -Icon 55 #"folder-blue-download"
+Set-UserFolderIcon -Name "Favorites" -ImageRes 115 -Icon 56 #"folder-blue-favorites"
+Set-UserFolderIcon -Name "Links" -ImageRes 185 -Icon 86 #"folder-blue-web"
+Set-UserFolderIcon -Name "Music" -ImageRes 108 -Icon 66 #"folder-blue-music"
+Set-UserFolderIcon -Name "Pictures" -ImageRes 113 -Icon 63 #"folder-blue-images"
+Set-UserFolderIcon -Name "Saved Games" -ImageRes 186 -Icon 57 #"folder-blue-games"
+Set-UserFolderIcon -Name "Searches" -ImageRes 18 -Icon 75 #"folder-blue-saved-search"
+Set-UserFolderIcon -Name "Videos" -ImageRes 189 -Icon 83 #"folder-blue-video"
 New-Item -ItemType SymbolicLink -Path ($Env:UserProfile + "\Documents\My Games") -Target ($Env:UserProfile + "\Saved Games") | Out-Null
 # Desktop
 Add-Reg -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons"
 Add-Reg -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons"
-Add-Reg -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons" -Name "34" -Type String "%ProgramData%\Windows Icons\desktop.ico"
-Add-Reg -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons" -Name "34" -Type String "%ProgramData%\Windows Icons\desktop.ico"
+Add-Reg -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons" -Name "34" -Type String "%ProgramData%\win11tweak-places.dll,52"
+Add-Reg -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons" -Name "34" -Type String "%ProgramData%\win11tweak-places.dll,52"
 # This PC
-Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\Windows Icons\computer.ico"
+Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\win11tweak-hardware.dll,45"
 # Recycle Bin
-Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon" -Name "empty" -Type ExpandString -Value "%ProgramData%\Windows Icons\recycle.ico"
-Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon" -Name "full" -Type ExpandString -Value "%ProgramData%\Windows Icons\recycle-full.ico"
+Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon" -Name "empty" -Type ExpandString -Value "%ProgramData%\win11tweak-places.dll,87"
+Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon" -Name "full" -Type ExpandString -Value "%ProgramData%\win11tweak-places.dll,88"
 # Network
-Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\Windows Icons\network.ico"
+Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\win11tweak-apps.dll,835"
 # Navigation Pane - Show All folders
 Add-Reg -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "NavPaneShowAllFolders" -Type Dword -Value "1"
 # Navigation Pane - Remove Quick Access
@@ -71,16 +82,16 @@ Remove-Reg -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Deskt
 # Control Panel
 Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{26EE0668-A00A-44D7-9371-BEB064C98683}"
 Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{26EE0668-A00A-44D7-9371-BEB064C98683}\DefaultIcon"
-Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{26EE0668-A00A-44D7-9371-BEB064C98683}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\Windows Icons\settings.ico"
+Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{26EE0668-A00A-44D7-9371-BEB064C98683}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\win11tweak-apps.dll,155"
 # User Files
 Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{59031A47-3F72-44A7-89C5-5595FE6B30EE}"
 Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{59031A47-3F72-44A7-89C5-5595FE6B30EE}\DefaultIcon"
-Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{59031A47-3F72-44A7-89C5-5595FE6B30EE}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\Windows Icons\folder-home.ico"
+Add-Reg -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{59031A47-3F72-44A7-89C5-5595FE6B30EE}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\win11tweak-places.dll,62"
 # System Drive
 $SysDrive = "${Env:SystemDrive}".Substring(0,1)
 Add-Reg -Path "HKCU:\Software\Classes\Applications"
 Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe"
 Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives"
 Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${SysDrive}"
 Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${SysDrive}\DefaultIcon"
-Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${SysDrive}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\Windows Icons\drive-win11.ico"
+Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${SysDrive}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\win11tweak-hardware.dll,73"

Modules/icons.ps1

@@ -39,7 +39,7 @@ Start-Process -FilePath "${Env:ProgramData}\chocolatey\bin\CHOCO.EXE" -ArgumentL
 Foreach ($pkg in $ChocoPkgs) {
     $ipkg = $pkg
     $runtest = ""
-    if ($pkg -eq "sharex" -Or $pkg -eq "simplewall") {
+    if ($pkg -eq "sharex" -Or $pkg -eq "simplewall" -Or $pkg -eq "everything") {
         $runtest = "${Env:SystemRoot}\system32\taskkill.exe /F /IM ${pkg}.exe >nul"
     }
     if ($pkg -eq "amazongames") {

Modules/packages.ps1

@@ -50,40 +50,40 @@ New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\RTSP-Local" | O
 Show-Section -Section "StartMenu" -Desc "Creating Shortcuts"
 # Add-Shortcut "SubMenu\Application OR Startup" "target.exe" "icon-name" "arguments" "working-directory"
 Add-Shortcut "Apps\Brave" "${Env:ProgramFiles}\BraveSoftware\Brave-Browser\Application\brave.exe" ""
-Add-Shortcut "Apps\SumatraPDF" "${Env:ProgramFiles}\SumatraPDF\SumatraPDF.exe" "gnome-books"
-Add-Shortcut "Apps\KeePassXC" "${Env:ProgramFiles}\KeePassXC\KeePassXC.exe" "keepassxc"
-#Add-Shortcut "Apps\Kleopatra" "${Env:ProgramFiles(x86)}\gpg4win\bin\kleopatra.exe" ""
-Add-Shortcut "Apps\Yubico Authenticator" "${Env:ProgramFiles}\Yubico\Yubico Authenticator\yubioath-desktop.exe" "yubioath"
-Add-Shortcut "Apps\Yubico Manager" "${Env:ProgramFiles}\Yubico\YubiKey Manager\ykman-gui.exe" "yubikey-personalization-gui"
-Add-Shortcut "Apps\Yubico PIV Manager" "${Env:ProgramFiles}\Yubico\YubiKey PIV Manager\pivman.exe" "yubikey-piv-manager"
-Add-Shortcut "Development\HeidiSQL" "${Env:ProgramFiles}\HeidiSQL\heidisql.exe" "sqlninja"
-Add-Shortcut "Development\KDiff3" "${Env:ProgramFiles}\KDiff3\kdiff3.exe" "kdiff3"
+Add-Shortcut "Apps\Everything" "${Env:ProgramFiles}\Everything\Everything.exe" "win11tweak-apps.dll,537"
+Add-Shortcut "Apps\SumatraPDF" "${Env:ProgramFiles}\SumatraPDF\SumatraPDF.exe" "win11tweak-apps.dll,449"
+Add-Shortcut "Apps\KeePassXC" "${Env:ProgramFiles}\KeePassXC\KeePassXC.exe" "win11tweak-apps.dll,621"
+Add-Shortcut "Apps\Yubico Authenticator" "${Env:ProgramFiles}\Yubico\Yubico Authenticator\authenticator.exe" "win11tweak-apps.dll,1363"
+Add-Shortcut "Apps\Yubico Manager" "${Env:ProgramFiles}\Yubico\YubiKey Manager\ykman-gui.exe" "win11tweak-apps.dll,1361"
+Add-Shortcut "Apps\Yubico PIV Manager" "${Env:ProgramFiles(x86)}\Yubico\YubiKey PIV Manager\pivman.exe" "win11tweak-apps.dll,1362"
+Add-Shortcut "Development\HeidiSQL" "${Env:ProgramFiles}\HeidiSQL\heidisql.exe" "win11tweak-apps.dll,1113"
+Add-Shortcut "Development\KDiff3" "${Env:ProgramFiles}\KDiff3\kdiff3.exe" "win11tweak-apps.dll,619"
 Add-Shortcut "Development\MarkText" "${Env:LocalAppData}\Programs\MarkText\MarkText.exe" ""
-Add-Shortcut "Development\Resource Hacker" "${Env:ProgramFiles(x86)}\Resource Hacker\ResourceHacker.exe" "teighaviewer"
+Add-Shortcut "Development\Resource Hacker" "${Env:ProgramFiles(x86)}\Resource Hacker\ResourceHacker.exe" "win11tweak-apps.dll,1175"
 Add-Shortcut "Development\Sublime Text" "${Env:ProgramFiles}\Sublime Text\sublime_text.exe" ""
-Add-Shortcut "Hardware\Core Temp" "${Env:ProgramData}\chocolatey\lib\coretemp\tools\Core Temp.exe" "thermal-monitor"
+Add-Shortcut "Hardware\Core Temp" "${Env:ProgramData}\chocolatey\lib\coretemp\tools\Core Temp.exe" "win11tweak-hardware.dll,138"
 Add-Shortcut "Hardware\CPU-Z" "${Env:ProgramFiles}\CPUID\CPU-Z\cpuz.exe" ""
 Add-Shortcut "Hardware\EarTrumpet" "${Env:ProgramData}\chocolatey\lib\eartrumpet\tools\EarTrumpet\EarTrumpet.exe" ""
 Add-Shortcut "Hardware\MSI Afterburner" "${Env:ProgramFiles(x86)}\MSI Afterburner\MSIAfterburner.exe" ""
-Add-Shortcut "Hardware\ScrCpy" "${Env:ProgramData}\chocolatey\lib\scrcpy\tools\scrcpy.exe" "android-file-transfer"
+Add-Shortcut "Hardware\ScrCpy" "${Env:ProgramData}\chocolatey\lib\scrcpy\tools\scrcpy.exe" "win11tweak-hardware.dll,3"
 Add-Shortcut "Hardware\Voicemeeter Potato" "${Env:ProgramFiles(x86)}\VB\Voicemeeter\voicemeeter8x64.exe" ""
 Add-Shortcut "Media\ImageGlass" "${Env:ProgramFiles}\ImageGlass\ImageGlass.exe" ""
-Add-Shortcut "Media\MPV" "${Env:ProgramData}\chocolatey\lib\mpv.install\tools\mpv.exe" "mpv"
-Add-Shortcut "RDP-Local\archlinux.machine" "${Env:ProgramFiles}\VirtViewer v11.0-256\bin\remote-viewer.exe" "distributor-logo-archlinux" "spice://archlinux.machine:5900"
-Add-Shortcut "RDP-Local\debian.machine" "${Env:ProgramFiles}\VirtViewer v11.0-256\bin\remote-viewer.exe" "distributor-logo-debian" "spice://debian.machine:5900"
-Add-Shortcut "RDP-Local\windows.machine" "${Env:ProgramFiles}\VirtViewer v11.0-256\bin\remote-viewer.exe" "codeblocks" "spice://windows.machine:5900"
-Add-Shortcut "SSH-Local\test.machine" "${Env:ProgramFiles}\Bin\ssh.bat" "urxvt" "test.machine 0"
-Add-Shortcut "SSH-Remote\test.machine.com" "${Env:ProgramFiles}\Bin\ssh.bat" "urxvt" "test.machine.com 1"
-Add-Shortcut "Startup" "`"%ProgramFiles%\Bin\gpg-forward.bat`"" "GPG Bridge"
-Add-Shortcut "Utilities\7-Zip File Manager" "${Env:ProgramFiles}\7-zip\7zFM.exe" "file-roller"
-Add-Shortcut "Utilities\Autoruns" "${Env:ProgramData}\chocolatey\lib\AutoRuns\tools\Autoruns.exe" "bomber"
+Add-Shortcut "Media\MPV" "${Env:ProgramData}\chocolatey\lib\mpv.install\tools\mpv.exe" "win11tweak-apps.dll,788"
+Add-Shortcut "RDP-Local\archlinux.machine" "${Env:ProgramFiles}\VirtViewer v11.0-256\bin\remote-viewer.exe" "win11tweak-apps.dll,1005" "spice://archlinux.machine:5900"
+Add-Shortcut "RDP-Local\debian.machine" "${Env:ProgramFiles}\VirtViewer v11.0-256\bin\remote-viewer.exe" "win11tweak-apps.dll,1007" "spice://debian.machine:5900"
+Add-Shortcut "RDP-Local\windows.machine" "${Env:ProgramFiles}\VirtViewer v11.0-256\bin\remote-viewer.exe" "win11tweak-apps.dll,1015" "spice://windows.machine:5900"
+Add-Shortcut "SSH-Local\test.machine" "${Env:ProgramFiles}\Bin\ssh.bat" "win11tweak-apps.dll,1119" "test.machine 0"
+Add-Shortcut "SSH-Remote\test.machine.com" "${Env:ProgramFiles}\Bin\ssh.bat" "win11tweak-apps.dll,1120" "test.machine.com 1"
+Add-Shortcut "Utilities\7-Zip File Manager" "${Env:ProgramFiles}\7-zip\7zFM.exe" "win11tweak-apps.dll,371"
+Add-Shortcut "Utilities\Autoruns" "${Env:ProgramData}\chocolatey\lib\AutoRuns\tools\Autoruns.exe" ""
 Add-Shortcut "Utilities\CCEnhancer" "${Env:ProgramFiles(x86)}\CCEnhancer\CCEnhancer.exe" ""
 Add-Shortcut "Utilities\CCleaner" "${Env:ProgramFiles}\CCleaner\CCleaner64.exe" ""
 Add-Shortcut "Utilities\Chocolatey GUI" "${Env:ProgramFiles(x86)}\Chocolatey GUI\ChocolateyGui.exe" ""
 Add-Shortcut "Utilities\NFOPad" "${Env:ProgramFiles(x86)}\NFOPad\NFOPad.exe" ""
+Add-Shortcut "Utilities\Process Explorer" "${Env:ProgramData}\chocolatey\lib\sysinternals\tools\procexp64.exe" ""
 Add-Shortcut "Utilities\ShareX" "${Env:ProgramFiles}\ShareX\ShareX.exe" ""
 Add-Shortcut "Utilities\SimpleWall" "${Env:ProgramFiles}\simplewall\simplewall.exe" ""
-Add-Shortcut "Utilities\WinDirStat" "${Env:ProgramFiles(x86)}\WinDirStat\windirstat.exe" "partitionmanager"
+Add-Shortcut "Utilities\WinDirStat" "${Env:ProgramFiles(x86)}\WinDirStat\windirstat.exe" "win11tweak-hardware.dll,69"
 
 # Remove Startup / Add Postfix
 Remove-Reg -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name "KeePassXC"