Windows 11 Build 22621.169

* Add: AntiVirus download script that downloads a copy of Adaware to the desktop * Add: PowerShell script that can automatically download a copy of Win11Tweaks * Add: Windows Defender logging disabled * Add: mpv-config automatically downloaded and fonts are installed * Add: Windows 11 Default Drive icon * Modify: Settings > Configuration in the Start Menu now includes Git/GPG/SSH configs * Modify: the games section in the Start Menu has been updated for Playnite * Modify: README.md has been updated to the reflect the changes in Windows 11 Build 22621.169 * Modify: FoxIt Reader was replaced with SumatraPDF (which can also read epubs, etc.) * Modify: youtube-dl was replaced with yt-dlp * Modify: Typora was replaced with MarkText * Fix: gpg-bridge is now properly downloaded from Github instead of being included * Fix: winhello.dll is now properly downloaded from Github * Fix: ComputerName and WorkgroupName are now set properly * Remove: Kaspersky AntiVirus * Remove: CryptoApps and everything associated
kyaulabs · Jul 12, 2022 · 9e62286 · 9e62286
1 parent ebce0db
commit 9e62286
Show file tree

Hide file tree

Showing 59 changed files with 364 additions and 133 deletions.
diff --git a/Modules/cleanup.ps1 b/Modules/cleanup.ps1
@@ -27,6 +27,17 @@
 . "${PSScriptRoot}\_funcs.ps1"
 . "${PSScriptRoot}\msedge.ps1"
 . "${PSScriptRoot}\defender.ps1"
+. "${PSScriptRoot}\mapdrives.ps1"
+
+# Mapped Network Drives
+$action = New-ScheduledTaskAction -Execute "powershell.exe" -Argument "NoLogo -NoProfile -ExecutionPolicy Bypass -File `"${PSScriptRoot}\mapdrives.ps1"`"
+$trigger = New-ScheduledTaskTrigger -AtLogOn
+$principal = New-ScheduledTaskPrincipal -UserId (Get-CimInstance -ClassName Win32_ComputerSystem | Select-Object -ExpandProperty UserName)
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Principal $principal
+Register-ScheduledTask KL_MapDrives -InputObject $task | Out-Null
+Start-ScheduledTask -TaskName KL_MapDrives | Out-Null
+Start-Sleep -Seconds 10 | Out-Null
+Unregister-ScheduledTask -TaskName KL_MapDrives -Confirm:$false | Out-Null
 
 $Location = Get-Location
 Del-Reg -Path "HKLM:\SOFTWARE\Classes\Directory\background\shell\git_gui" -Recursive
@@ -35,8 +46,6 @@ Output-Section -Section "Cleanup" -Desc "Download Brave"
 Invoke-WebRequest https://laptop-updates.brave.com/latest/winx64 -OutFile ${Env:UserProfile}\Desktop\BraveSetup.exe | Out-Null
 Output-Section -Section "Cleanup" -Desc "Download OpenShell"
 Invoke-WebRequest https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.170/OpenShellSetup_4_4_170.exe -OutFile ${Env:UserProfile}\Desktop\OpenShellSetup.exe | Out-Null
-Output-Section -Section "Cleanup" -Desc "Download Typora"
-Invoke-WebRequest https://download.typora.io/windows/typora-update-x64-1117.exe -OutFile ${Env:UserProfile}\Desktop\typora-update-x64-1117.exe | Out-Null
 
 Output-Section -Section "Cleanup" -Desc "Last Minute Removals"
 If (-NOT $WinDefender) {
@@ -64,11 +73,26 @@ Unregister-ScheduledTask -TaskName "Microsoft Compatibility Appraiser" -Confirm:
 Output-Section -Section "Cleanup" -Desc "User Configs"
 Copy-Item ${Location}\..\Tools\OpenShell.xml ${Env:UserProfile}\Desktop -Force | Out-Null
 Copy-Item ${Location}\..\Tools\wt.json ${Env:LocalAppData}\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json -Force | Out-Null
-Copy-Item ${Location}\..\Tools\gpg-bridge.exe ${Env:ProgramFiles}\Bin -Force | Out-Null
 
-If ($CryptoApps) {
-    Remove-Item -Path "${Env:UserProfile}\Desktop\exodus-windows*.exe" -Force | Out-Null
-}
+# %AppData%\mpv
+New-Item -Type Directory -Path "${Env:AppData}\mpv" | Out-Null
+Invoke-WebRequest https://github.com/kyaulabs/mpv-config/archive/refs/heads/master.zip -OutFile ${Env:UserProfile}\Downloads\mpv-config.zip | Out-Null
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+[System.IO.Compression.ZipFile]::ExtractToDirectory("${Env:UserProfile}\Downloads\mpv-config.zip", "${Env:AppData}\mpv")
+Remove-Item -Path "${Env:UserProfile}\Downloads\mpv-config.zip" -Force | Out-Null
+Move-Item -Path "${Env:AppData}\mpv\mpv-config-master\*" -Destination "${Env:AppData}\mpv" -Force | Out-Null
+Remove-Item -Path "${Env:AppData}\mpv\mpv-config-master" -Force | Out-Null
+$fonts = (New-Object -ComObject Shell.Application).Namespace(0x14)
+dir ${Env:AppData}\mpv\fonts\*.ttf | %%{ $fonts.CopyHere($_.fullname) }
+
+# %ProgramFiles%\Git\usr\lib\winhello.dll
+Invoke-WebRequest https://github.com/tavrez/openssh-sk-winhello/releases/download/v2.0.0/winhello.dll -OutFile ${Env:ProgramFiles}\Git\usr\lib\winhello.dll -Force | Out-Null
+
+# %ProgramFiles%\Bin\gpg-bridge.exe
+Invoke-WebRequest https://github.com/BusyJay/gpg-bridge/releases/download/v0.1.0/gpg-bridge-v0.1.0.zip -OutFile ${Env:UserProfile}\Downloads\gpg-bridge.zip | Out-Null
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+[System.IO.Compression.ZipFile]::ExtractToDirectory("${Env:UserProfile}\Downloads\gpg-bridge.zip", "${Env:ProgramFiles}\Bin")
+Remove-Item -Path "${Env:UserProfile}\Downloads\gpg-bridge.zip" -Force | Out-Null
 
 # %ProgramFiles%\Bin\gpg-forward.bat
 $gpgforward = @"
@@ -193,3 +217,4 @@ Del-Reg -Path "HKCR:\LibraryFolder\background\shell\git_shell" -Recursive
 # Clean StartMenu
 Remove-Item -Path "${Env:UserProfile}\Desktop\*.LNK" -Force | Out-Null
 Remove-Item -Path "${Env:Public}\Desktop\*.LNK" -Force | Out-Null
+Remove-Item -Path "${Env:ProgramData}\Microsoft\Windows\Start Menu\*.LNK" -Force | Out-Null
diff --git a/Modules/defaults.ps1 b/Modules/defaults.ps1
@@ -36,8 +36,8 @@ Set-NetConnectionProfile -NetworkCategory Private | Out-Null
 NETSH.EXE advfirewall firewall set rule group="Network Discovery" new enable=Yes | Out-Null
 Add-Reg -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" -Name "LocalAccountTokenFilterPolicy" -Type Dword -Value "1"
 # Rename Computer & Set Workgroup
-Rename-Computer -NewName $ComputerName -NoRestart | Out-Null
-Add-Computer -WorkGroupName $WorkGroupName -NoRestart | Out-Null
+Rename-Computer -NewName $ComputerName | Out-Null
+Add-Computer -WorkGroupName $WorkGroupName | Out-Null
 
 # Remove System Restore
 Output-Section -Section "Defaults" -Desc "Remove System Restore"
@@ -239,6 +239,9 @@ Start-Process -FilePath "${Env:SystemRoot}\system32\WindowsPowerShell\v1.0\power
 # Start Menu
 . "${PSScriptRoot}\startmenu.ps1"
 
+# Mapped Network Drives
+. "${PSScriptRoot}\mapdrives.ps1"
+
 # Reboot
 Write-Output "[37m [0m"
 Read-Host -Prompt "[37mPress [1;37mENTER[0m [37mto reboot [0m"

diff --git a/Modules/defender.ps1 b/Modules/defender.ps1
@@ -91,6 +91,8 @@ If (-NOT $WinDefender) {
     Del-Reg -Path "HKLM:\SYSTEM\CurrentControlSet\Services\Sense" -Recursive
     Add-Reg -Path "HKLM:\SOFTWARE\Policies\Microsoft\MRT" -Name "DontReportInfectionInformation" -Type Dword -Value "1"
     Add-Reg -Path "HKLM:\SOFTWARE\Policies\Microsoft\MRT" -Name "DontOfferThroughWUAU" -Type Dword -Value "1"
+    Add-Reg -Path "HKLM:\System\CurrentControlSet\Control\WMI\Autologger\DefenderApiLogger" -Name "Start" -Type Dword -Value "0"
+    Add-Reg -Path "HKLM:\System\CurrentControlSet\Control\WMI\Autologger\DefenderAuditLogger" -Name "Start" -Type Dword -Value "0"
 
     If (-NOT $SecurityHealth) {
         Output-Section -Section "Anti-Virus" -Desc "Removing Windows Security"

diff --git a/Modules/download.ps1 b/Modules/download.ps1
@@ -0,0 +1,31 @@
+<#
+ ▄▄▄▄ ▄▄▄▄ ▄▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ █ ▄▄ ▄ ▄▄ ▄ ▄▄▄▄ ▄▄ ▄    ▄▄   ▄▄▄▄ ▄▄▄▄  ▄▄▄ ▀
+ █ ██ █ ██ █ ██ █ ██ █    ██   ██ █ ██ █ ██▀  █
+ ■ ██▄▀ ██▄█ ██▄█ ██ █ ▀▀ ██   ██▄█ ██▄▀ ▀██▄ ■
+ █ ██ █ ▄▄ █ ██ █ ██ █    ██▄▄ ██ █ ██ █  ▄██ █
+ ▄ ▀▀ ▀ ▀▀▀▀ ▀▀ ▀ ▀▀▀▀    ▀▀▀▀ ▀▀ ▀ ▀▀▀▀ ▀▀▀  █
+ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀
+
+ Win11Tweaks (KYAU Labs Edition)
+ Copyright (C) 2022 KYAU Labs (https://kyaulabs.com)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#>
+
+Invoke-WebRequest https://github.com/kyaulabs/win11tweak/archive/refs/heads/master.zip -OutFile ${Env:UserProfile}\Downloads\win11tweak.zip | Out-Null
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+[System.IO.Compression.ZipFile]::ExtractToDirectory("${Env:UserProfile}\Downloads\win11tweak.zip", "${Env:UserProfile}\Desktop")
+Rename-Item -Path "${Env:UserProfile}\Desktop\win11tweak-master" -NewName "${Env:UserProfile}\Desktop\win11tweak"
+Remove-Item -Path "${Env:UserProfile}\Downloads\win11tweak.zip" -Force | Out-Null
diff --git a/Modules/icons.ps1 b/Modules/icons.ps1
@@ -107,4 +107,4 @@ 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-win10.ico"
+Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${SysDrive}\DefaultIcon" -Name "(Default)" -Type String -Value "%ProgramData%\Windows Icons\drive-win11.ico"
diff --git a/Modules/mapdrives.ps1 b/Modules/mapdrives.ps1
@@ -0,0 +1,56 @@
+<#
+ ▄▄▄▄ ▄▄▄▄ ▄▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ █ ▄▄ ▄ ▄▄ ▄ ▄▄▄▄ ▄▄ ▄    ▄▄   ▄▄▄▄ ▄▄▄▄  ▄▄▄ ▀
+ █ ██ █ ██ █ ██ █ ██ █    ██   ██ █ ██ █ ██▀  █
+ ■ ██▄▀ ██▄█ ██▄█ ██ █ ▀▀ ██   ██▄█ ██▄▀ ▀██▄ ■
+ █ ██ █ ▄▄ █ ██ █ ██ █    ██▄▄ ██ █ ██ █  ▄██ █
+ ▄ ▀▀ ▀ ▀▀▀▀ ▀▀ ▀ ▀▀▀▀    ▀▀▀▀ ▀▀ ▀ ▀▀▀▀ ▀▀▀  █
+ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀
+
+ Win11Tweaks (KYAU Labs Edition)
+ Copyright (C) 2022 KYAU Labs (https://kyaulabs.com)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#>
+
+. "${PSScriptRoot}\_funcs.ps1"
+
+# Map All Network Drives
+Output-Section -Section "Network" -Desc "Mapped Drives"
+Foreach ($drive in $MappedDrives) {
+    $Letter = $drive.DriveLetter
+    $RemotePath = $drive.RemotePath
+    $Name = $drive.Name
+    $Icon = $drive.Icon
+    if ($RemotePath) {
+        Add-Reg -Path "HKCU:\Network\${Letter}"
+        Add-Reg -Path "HKCU:\Network\${Letter}" -Name "ConnectionType" -Type Dword -Value "0"
+        Add-Reg -Path "HKCU:\Network\${Letter}" -Name "DeferFlags" -Type Dword -Value "4"
+        Add-Reg -Path "HKCU:\Network\${Letter}" -Name "ProviderName" -Type String -Value "Microsoft Windows Network"
+        Add-Reg -Path "HKCU:\Network\${Letter}" -Name "ProviderType" -Type Dword -Value "131072"
+        Add-Reg -Path "HKCU:\Network\${Letter}" -Name "RemotePath" -Type String -Value "${RemotePath}"
+        Add-Reg -Path "HKCU:\Network\${Letter}" -Name "UserName" -Type Dword -Value "0"
+    }
+
+    $sh = New-Object -com Shell.Application
+    $sh.NameSpace($Letter+':').Self.Name = ${Name}
+    if ($Icon) {
+        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\${Letter}"
+        Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${Letter}\DefaultIcon"
+        Add-Reg -Path "HKCU:\Software\Classes\Applications\Explorer.exe\Drives\${Letter}\DefaultIcon" -Name "(Default)" -Type String -Value ${Icon}
+    }
+}
diff --git a/Modules/packages.ps1 b/Modules/packages.ps1
@@ -37,10 +37,15 @@ Output-Section -Section "Packages" -Desc "Install"
 Write-Host " " -NoNewline
 Start-Process -FilePath "${Env:ProgramData}\chocolatey\bin\CHOCO.EXE" -ArgumentList "install powershell-core --install-arguments=`"ENABLE_PSREMOTING=1`" -y -r" -NoNewWindow -Wait -RedirectStandardOutput "${Env:UserProfile}\choco_install.txt"
 Foreach ($pkg in $ChocoPkgs) {
+    $ipkg = $pkg
     $runtest = ""
     if ($pkg -eq "sharex" -Or $pkg -eq "simplewall") {
         $runtest = "${Env:SystemRoot}\system32\taskkill.exe /F /IM ${pkg}.exe >nul"
     }
+    if ($pkg -eq "amazongames") {
+        $pkg = "${pkg} --checksum 49DD00B312A87B9E40695D68D0680360C97189251EE2EF91C8BDABEC40FFFDD7"
+        $runtest = "${Env:SystemRoot}\system32\taskkill.exe /F /IM `"Amazon Games UI.exe`" >nul"
+    }
     $runcmd = @"
 @ECHO OFF
 
@@ -51,46 +56,15 @@ $runtest
     Start-Process -FilePath "${Env:UserProfile}\runcmd.bat" -NoNewWindow -Wait
     Remove-Item -Path "${Env:UserProfile}\runcmd.bat" -Force | Out-Null
     #Start-Process -FilePath "${Env:ProgramData}\chocolatey\bin\CHOCO.EXE" -ArgumentList "install $pkg -y -r --ignore-package-codes" -NoNewWindow -Wait -RedirectStandardOutput "${Env:UserProfile}\choco_install.txt"
-    Write-Host " : ${pkg} [1;32m${check}[0m" -NoNewline
+    Write-Host " : ${ipkg} [1;32m${check}[0m" -NoNewline
+    if ($ipkg -eq "amazongames") {
+
+    }
 }
 Write-Host "`n" -NoNewline
 
 # Change Calculator Keyboard Key to Speedcrunch
 Add-Reg -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AppKey\18" -Name "ShellExecute" -Type String -Value "%ProgramFiles(x86)%\SpeedCrunch\speedcrunch.exe"
 
-if ($CryptoApps) {
-    # Install Exodus Wallet
-    $UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0"
-    $Links = $(Invoke-WebRequest -URI "https://www.exodus.com/releases/" -UserAgent $UA).Links | Select href | Out-String
-    Foreach ($Link in $Links -split "`n") {
-        $Match = $Link | Select-String -Pattern "releases\/hashes" -CaseSensitive
-        if ($Match) {
-            #Write-Output $Link
-            $Exodus = $(Invoke-WebRequest -URI $Link -UserAgent $UA).Content | Out-String
-            Foreach ($Line in $Exodus -split "`n") {
-                $Match = $Line | Select-String -Pattern "windows-x64(.*)exe" -CaseSensitive
-                if ($Match) {
-                    #Write-Output $line
-                    $File = $Line -split " "
-                    $URL = "https://downloads.exodus.com/releases/" + $File[1]
-                    $Out = "${Env:UserProfile}\" + $File[1]
-                    $SHA = $File[0]
-                    Invoke-WebRequest $URL -OutFile $Out | Out-Null
-                    If (( Get-FileHash -Algorithm SHA256 $Out ).Hash -eq $SHA) {
-                        Start-Process -FilePath $Out -ArgumentList "/s /v`"/qn`"" -NoNewWindow -Wait | Out-Null
-                    }
-                }
-            }
-        }
-    }
-    # Install TradingView
-    Invoke-WebRequest "https://tvd-packages.tradingview.com/stable/latest/win32/TradingView.appinstaller" -OutFile "${Env:UserProfile}\TradingView.appinstaller"
-    $msix = Select-String -Path "${Env:UserProfile}\TradingView.appinstaller" -Pattern "\.msix" | %{ ([regex]::match( $_ , '(?<=")(.+)(?=")' )).value }
-    Invoke-WebRequest $msix -OutFile "${Env:UserProfile}\TradingView.msix"
-    Remove-Item -Path "${Env:UserProfile}\TradingView.appinstaller" -Force | Out-Null
-    Add-AppxPackage -Path "${Env:UserProfile}\TradingView.msix" -Confirm:$false
-    Remove-Item -Path "${Env:UserProfile}\TradingView.msix" -Force | Out-Null
-}
-
 # Cleanup
 Remove-Item -Path "${Env:UserProfile}\choco_install.txt" -Force | Out-Null
diff --git a/Modules/postfix.cmd b/Modules/postfix.cmd
@@ -42,16 +42,11 @@ taskkill /F /IM explorer.exe >nul
 ECHO [1;36m■[1;37m PostFix:[0m This Window Will Close When Finished
 PowerShell -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%~dp0cleanup.ps1"
 
-::MOVE /Y %UserProfile%\Contacts\desktop.ini2 %UserProfile%\Contacts\desktop.ini
-ECHO [1;36m■[1;37m PostFix:[0m Install Typora
-%UserProfile%\Desktop\typora-update-x64-1117.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
 IF EXIST "%ProgramFiles(x86)%\RivaTuner Statistics Server\Uninstall.exe" (
 	ECHO [1;36m■[1;37m PostFix:[0m Remove RivaTuner
 	"%ProgramFiles(x86)%\RivaTuner Statistics Server\Uninstall.exe" /S /SUPPRESSMSGBOXES
-	RD "%ProgramFiles(x86)%\RivaTuner Statistics Server" /Q /S /NO >nul
+	RD "%ProgramFiles(x86)%\RivaTuner Statistics Server" /Q /S >nul
 )
-DEL /F /Q %UserProfile%\Desktop\typora-update-x64-1117.exe
-taskkill /F /IM typora.exe >nul
 REG DELETE "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v "PostFix" /F >nul
 ECHO [1;36m■[1;37m PostFix:[0m Restarting Explorer.exe
 start explorer.exe

diff --git a/Modules/startmenu.ps1 b/Modules/startmenu.ps1
@@ -35,9 +35,6 @@ New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\AdobeCC" | Out-
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\Apps" | Out-Null
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\BBS" | Out-Null
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\Creative" | Out-Null
-If ($CryptoApps) {
-    New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\Crypto" | Out-Null
-}
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\Development" | Out-Null
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\Games" | Out-Null
 New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\Hardware" | Out-Null
@@ -53,21 +50,17 @@ New-Item -Type Directory -Path "${Env:ProgramData}\Windows Start\RTSP-Local" | O
 Output-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\Foxit PDF Reader" "${Env:ProgramFiles(x86)}\Foxit Software\Foxit PDF Reader\FoxitPDFReader.exe" "foxit-reader"
+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"
-If ($CryptoApps) {
-    Add-Shortcut "Crypto\Exodus" "${Env:LocalAppData}\exodus\Exodus.exe" ""
-    Add-Shortcut "Crypto\TradingView" "${Env:SystemRoot}\explorer.exe" "" "shell:AppsFolder\TradingView.Desktop_n534cwy3pjxzj!TradingView"
-}
 Add-Shortcut "Development\HeidiSQL" "${Env:ProgramFiles}\HeidiSQL\heidisql.exe" "sqlninja"
 Add-Shortcut "Development\KDiff3" "${Env:ProgramFiles}\KDiff3\kdiff3.exe" "kdiff3"
+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\Sublime Text" "${Env:ProgramFiles}\Sublime Text\sublime_text.exe" ""
-Add-Shortcut "Development\Typora" "${Env:ProgramFiles}\Typora\Typora.exe" "typora"
 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" ""