diff --git a/README.md b/README.md
index 33f8aa7d..9c51ea09 100644
--- a/README.md
+++ b/README.md
@@ -209,28 +209,6 @@ _This section can manually adjust `Optional Features` from the system, working a
 
 </details>
 
-## ⚡ Troubleshooting Known Issues
-
-> For each issue, expand the issue you're looking for,
-> and Open PowerShell as admin to copy + paste it's content:
-
-<details>
-  <summary>Fix <code>NVIDIA Control Panel</code></summary>
-
-> Only this time (Recommended - Consumes less RAM after boot)
-
-```Powershell
-Get-Service "NVDisplay.ContainerLocalSystem" | Set-Service -StartupType Manual -PassThru | Start-Service
-```
-
-> Permanently (Keeps the service running along with the system)
-
-```Powershell
-Get-Service "NVDisplay.ContainerLocalSystem" | Set-Service -StartupType Automatic -PassThru | Start-Service
-```
-
-</details>
-
 ## 🏅 More Debloat Scripts (Community)
 
 <details>
diff --git a/WinDebloatTools.ps1 b/WinDebloatTools.ps1
index f4025398..91fcb765 100644
--- a/WinDebloatTools.ps1
+++ b/WinDebloatTools.ps1
@@ -21,21 +21,21 @@ function Main() {
         Request-AdminPrivilege # Check admin rights
         Get-ChildItem -Recurse $PSScriptRoot\*.ps*1 | Unblock-File
 
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Get-HardwareInfo.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Open-File.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Manage-Software.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Request-FileDownload.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Set-ConsoleStyle.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Set-RevertStatus.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Start-Logging.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\"Title-Templates.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\ui\"Get-CurrentResolution.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\ui\"Get-DefaultColor.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\ui\"New-LayoutPage.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\ui\"Show-MessageDialog.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\lib\ui\"Ui-Helper.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\utils\"Individual-Tweaks.psm1" -Force
-        Import-Module -DisableNameChecking $PSScriptRoot\src\utils\"Install-Individual-System-Apps.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Get-HardwareInfo.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Open-File.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Manage-Software.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Request-FileDownload.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Set-ConsoleStyle.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Set-RevertStatus.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Start-Logging.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\Title-Templates.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\ui\Get-CurrentResolution.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\ui\Get-DefaultColor.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\ui\New-LayoutPage.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\ui\Show-MessageDialog.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\lib\ui\Ui-Helper.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\utils\Individual-Tweaks.psm1" -Force
+        Import-Module -DisableNameChecking "$PSScriptRoot\src\utils\Install-Individual-System-Apps.psm1" -Force
 
         Set-ConsoleStyle
         $CurrentFileName = (Split-Path -Path $PSCommandPath -Leaf).Split('.')[0]
diff --git a/src/lib/Get-HardwareInfo.psm1 b/src/lib/Get-HardwareInfo.psm1
index 81b4fc59..322dbf8f 100644
--- a/src/lib/Get-HardwareInfo.psm1
+++ b/src/lib/Get-HardwareInfo.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
 
 function Get-CPU() {
     [CmdletBinding()]
diff --git a/src/lib/Grant-RegistryPermission.psm1 b/src/lib/Grant-RegistryPermission.psm1
index cc762491..afd6a5c0 100644
--- a/src/lib/Grant-RegistryPermission.psm1
+++ b/src/lib/Grant-RegistryPermission.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
 
 # Adapted from: https://www.ipswitch.com/blog/how-to-change-registry-permissions-with-powershell
 
diff --git a/src/lib/Install-Font.psm1 b/src/lib/Install-Font.psm1
index eaac2f55..c41977a2 100644
--- a/src/lib/Install-Font.psm1
+++ b/src/lib/Install-Font.psm1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Get-TempScriptFolder.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Get-TempScriptFolder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
 
 # Adapted From: https://gist.github.com/anthonyeden/0088b07de8951403a643a8485af2709b?permalink_comment_id=3651336#gistcomment-3651336
 
diff --git a/src/lib/Manage-Software.psm1 b/src/lib/Manage-Software.psm1
index 698490f8..670f231f 100644
--- a/src/lib/Manage-Software.psm1
+++ b/src/lib/Manage-Software.psm1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\ui\"Show-MessageDialog.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\ui\Show-MessageDialog.psm1"
 
 function Install-Software() {
     [CmdletBinding()]
diff --git a/src/lib/New-Shortcut.psm1 b/src/lib/New-Shortcut.psm1
index 5c0b826a..cf3caff0 100644
--- a/src/lib/New-Shortcut.psm1
+++ b/src/lib/New-Shortcut.psm1
@@ -1,6 +1,6 @@
 # Adapted From: https://shellgeek.com/create-shortcuts-on-user-desktop-using-powershell/
 # Short circuit code: https://stackoverflow.com/a/26768902
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
 
 function New-Shortcut() {
     [CmdletBinding(SupportsShouldProcess)]
diff --git a/src/lib/Open-File.psm1 b/src/lib/Open-File.psm1
index 7d504b23..51491c00 100644
--- a/src/lib/Open-File.psm1
+++ b/src/lib/Open-File.psm1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\ui\"Show-MessageDialog.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\ui\Show-MessageDialog.psm1"
 
 function Open-PowerShellFilesCollection {
     [CmdletBinding()]
@@ -21,7 +21,7 @@ function Open-PowerShellFilesCollection {
         $LastAccessUtc = "v$((Get-Item "$FileName").LastWriteTimeUtc | Get-Date -Format "yyyy-MM-dd")"
         $Private:Counter = Write-TitleCounter "$FileName ($LastAccessUtc)" -Counter $Counter -MaxLength $Scripts.Length
         If ($OpenFromGUI) {
-            Import-Module -DisableNameChecking .\"$FileName" -Force
+            Import-Module .\"$FileName" -Force
         } Else {
             PowerShell -NoProfile -ExecutionPolicy Bypass -File .\"$FileName"
         }
diff --git a/src/lib/Request-FileDownload.psm1 b/src/lib/Request-FileDownload.psm1
index 1e210e3d..f67bcd58 100644
--- a/src/lib/Request-FileDownload.psm1
+++ b/src/lib/Request-FileDownload.psm1
@@ -1,9 +1,10 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Get-TempScriptFolder.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
+Import-Module BitsTransfer
+Import-Module -DisableNameChecking "$PSScriptRoot\Get-TempScriptFolder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
 
 function Request-FileDownload {
     [CmdletBinding()]
-    [OutputType([String])]
+    [OutputType([String[]])]
     param (
         [Alias('URI')]
         [Parameter(Position = 0, Mandatory)]
@@ -16,11 +17,12 @@ function Request-FileDownload {
         [String] $OutputFile,
         [Alias('RelativeFolder')]
         [Parameter(Position = 3)]
-        [String] $ExtendFolder = ""
+        [String] $ExtendFolder
     )
 
     Write-Verbose "[?] I'm at: $PWD"
     Write-Verbose "[?] Downloading at: $OutputFolder + $ExtendFolder"
+    Write-Verbose "START '$OutputFolder' $($OutputFolder.GetType())"
 
     If ($ExtendFolder) {
         $OutputFolder = Join-Path -Path $OutputFolder -ChildPath $ExtendFolder
@@ -28,17 +30,16 @@ function Request-FileDownload {
 
     If (!(Test-Path $OutputFolder)) {
         Write-Status -Types "@" -Status "$OutputFolder doesn't exist, creating folder..."
-        New-Item -Path $OutputFolder -ItemType Directory
+        New-Item -Path $OutputFolder -ItemType Directory -Force
     }
 
-    $FileLocation = $(Join-Path -Path $OutputFolder -ChildPath "$OutputFile")
+    $FileLocation = Join-Path -Path $OutputFolder -ChildPath $OutputFile
 
-    Import-Module BitsTransfer
-    Write-Host
     Write-Status -Types "@" -Status "Downloading from: '$FileURI' as '$OutputFile'"
     Write-Status -Types "@" -Status "On: '$FileLocation'"
-    Start-BitsTransfer -Dynamic -RetryTimeout 60 -TransferType Download -Source $FileURI -Destination $FileLocation
+    Start-BitsTransfer -Source "$FileURI" -Destination "$FileLocation" -Dynamic -DisplayName $OutputFile -TransferType Download | Wait-Job
 
+    Write-Verbose "END '$FileLocation' $($FileLocation.GetType())"
     return "$FileLocation"
 }
 
diff --git a/src/lib/Start-Logging.psm1 b/src/lib/Start-Logging.psm1
index 9b21af9b..1a27fefa 100644
--- a/src/lib/Start-Logging.psm1
+++ b/src/lib/Start-Logging.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Get-TempScriptFolder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Get-TempScriptFolder.psm1"
 
 function Start-Logging() {
     [CmdletBinding(SupportsShouldProcess)]
diff --git a/src/lib/Unregister-DuplicatedPowerPlan.psm1 b/src/lib/Unregister-DuplicatedPowerPlan.psm1
index d47a9b10..f5f69699 100644
--- a/src/lib/Unregister-DuplicatedPowerPlan.psm1
+++ b/src/lib/Unregister-DuplicatedPowerPlan.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Title-Templates.psm1"
 
 function Unregister-DuplicatedPowerPlan() {
     Begin {
diff --git a/src/lib/debloat-helper/Remove-ItemVerified.psm1 b/src/lib/debloat-helper/Remove-ItemVerified.psm1
index a09e977d..19b2682c 100644
--- a/src/lib/debloat-helper/Remove-ItemVerified.psm1
+++ b/src/lib/debloat-helper/Remove-ItemVerified.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Remove-ItemVerified() {
     [CmdletBinding(SupportsShouldProcess)]
diff --git a/src/lib/debloat-helper/Remove-UWPApp.psm1 b/src/lib/debloat-helper/Remove-UWPApp.psm1
index 66bf0267..3b75ff80 100644
--- a/src/lib/debloat-helper/Remove-UWPApp.psm1
+++ b/src/lib/debloat-helper/Remove-UWPApp.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Remove-UWPApp() {
     [CmdletBinding()]
diff --git a/src/lib/debloat-helper/Set-CapabilityState.psm1 b/src/lib/debloat-helper/Set-CapabilityState.psm1
index 21cf3883..3cacb8d1 100644
--- a/src/lib/debloat-helper/Set-CapabilityState.psm1
+++ b/src/lib/debloat-helper/Set-CapabilityState.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Set-CapabilityState() {
     [CmdletBinding()]
diff --git a/src/lib/debloat-helper/Set-ItemPropertyVerified.psm1 b/src/lib/debloat-helper/Set-ItemPropertyVerified.psm1
index b3bdc646..4b76b335 100644
--- a/src/lib/debloat-helper/Set-ItemPropertyVerified.psm1
+++ b/src/lib/debloat-helper/Set-ItemPropertyVerified.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Set-ItemPropertyVerified() {
     [CmdletBinding(SupportsShouldProcess)]
diff --git a/src/lib/debloat-helper/Set-OptionalFeatureState.psm1 b/src/lib/debloat-helper/Set-OptionalFeatureState.psm1
index 0839d9d8..96b69c63 100644
--- a/src/lib/debloat-helper/Set-OptionalFeatureState.psm1
+++ b/src/lib/debloat-helper/Set-OptionalFeatureState.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Set-OptionalFeatureState() {
     [CmdletBinding()]
diff --git a/src/lib/debloat-helper/Set-ScheduledTaskState.psm1 b/src/lib/debloat-helper/Set-ScheduledTaskState.psm1
index 403e09d4..824d1f24 100644
--- a/src/lib/debloat-helper/Set-ScheduledTaskState.psm1
+++ b/src/lib/debloat-helper/Set-ScheduledTaskState.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Set-ScheduledTaskState() {
     [CmdletBinding()]
diff --git a/src/lib/debloat-helper/Set-ServiceStartup.psm1 b/src/lib/debloat-helper/Set-ServiceStartup.psm1
index f0e16c0f..185cb74e 100644
--- a/src/lib/debloat-helper/Set-ServiceStartup.psm1
+++ b/src/lib/debloat-helper/Set-ServiceStartup.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function Set-ServiceStartup() {
     [CmdletBinding()]
diff --git a/src/lib/ui/Get-CurrentResolution.psm1 b/src/lib/ui/Get-CurrentResolution.psm1
index ea35f58e..864d4121 100644
--- a/src/lib/ui/Get-CurrentResolution.psm1
+++ b/src/lib/ui/Get-CurrentResolution.psm1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Ui-Helper.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Ui-Helper.psm1"
 
 function Get-CurrentResolution() {
     [CmdletBinding()]
diff --git a/src/lib/ui/New-LayoutPage.psm1 b/src/lib/ui/New-LayoutPage.psm1
index 04e5fe28..7feee5b9 100644
--- a/src/lib/ui/New-LayoutPage.psm1
+++ b/src/lib/ui/New-LayoutPage.psm1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\"Ui-Helper.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Ui-Helper.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 function New-LayoutPage() {
     [CmdletBinding()]
diff --git a/src/lib/ui/Ui-Helper.psm1 b/src/lib/ui/Ui-Helper.psm1
index ec6725d2..10dc43b3 100644
--- a/src/lib/ui/Ui-Helper.psm1
+++ b/src/lib/ui/Ui-Helper.psm1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\"Get-DefaultColor.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\Get-DefaultColor.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\Title-Templates.psm1"
 
 # Adapted from: https://stackoverflow.com/a/35965782
 # Adapted from: https://www.osdeploy.com/modules/pshot/technical/resolution-scale-and-dpi
diff --git a/src/scripts/Backup-System.ps1 b/src/scripts/Backup-System.ps1
index 80a6aa8e..e3c1a4d4 100644
--- a/src/scripts/Backup-System.ps1
+++ b/src/scripts/Backup-System.ps1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
 
 $Script:TweakType = "Backup"
 
diff --git a/src/scripts/Install-PackageManager.ps1 b/src/scripts/Install-PackageManager.ps1
index b4969221..db1bc5d8 100644
--- a/src/scripts/Install-PackageManager.ps1
+++ b/src/scripts/Install-PackageManager.ps1
@@ -1,7 +1,7 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Get-HardwareInfo.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Get-TempScriptFolder.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Request-FileDownload.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Get-HardwareInfo.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Get-TempScriptFolder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Request-FileDownload.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
 
 # Adapted from: https://github.com/ChrisTitusTech/win10script/blob/master/win10debloat.ps1
 # Adapted from: https://github.com/W4RH4WK/Debloat-Windows-10/blob/master/utils/install-basic-software.ps1
diff --git a/src/scripts/Optimize-Performance.ps1 b/src/scripts/Optimize-Performance.ps1
index 7e0b57a9..a720ccb9 100644
--- a/src/scripts/Optimize-Performance.ps1
+++ b/src/scripts/Optimize-Performance.ps1
@@ -1,8 +1,8 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Open-File.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Unregister-DuplicatedPowerPlan.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\utils\"Individual-Tweaks.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Open-File.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Unregister-DuplicatedPowerPlan.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\utils\Individual-Tweaks.psm1"
 
 # Adapted from: https://youtu.be/hQSkPmZRCjc
 # Adapted from: https://github.com/ChrisTitusTech/win10script
diff --git a/src/scripts/Optimize-Privacy.ps1 b/src/scripts/Optimize-Privacy.ps1
index 44e7a9a9..7186010b 100644
--- a/src/scripts/Optimize-Privacy.ps1
+++ b/src/scripts/Optimize-Privacy.ps1
@@ -1,7 +1,7 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\utils\"Individual-Tweaks.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\utils\Individual-Tweaks.psm1"
 
 # Adapted from: https://youtu.be/qWESrvP_uU8
 # Adapted from: https://youtu.be/hQSkPmZRCjc
diff --git a/src/scripts/Optimize-Security.ps1 b/src/scripts/Optimize-Security.ps1
index 0092df9c..df2fa387 100644
--- a/src/scripts/Optimize-Security.ps1
+++ b/src/scripts/Optimize-Security.ps1
@@ -1,7 +1,7 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Get-HardwareInfo.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\utils\"Individual-Tweaks.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Get-HardwareInfo.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\utils\Individual-Tweaks.psm1"
 
 # Adapted from: https://youtu.be/xz3oXHleKoM
 # Adapted from: https://github.com/ChrisTitusTech/win10script
diff --git a/src/scripts/Optimize-ServicesRunning.ps1 b/src/scripts/Optimize-ServicesRunning.ps1
index 658225a4..ba1c1e31 100644
--- a/src/scripts/Optimize-ServicesRunning.ps1
+++ b/src/scripts/Optimize-ServicesRunning.ps1
@@ -1,6 +1,6 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Get-HardwareInfo.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ServiceStartup.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Get-HardwareInfo.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ServiceStartup.psm1"
 
 # Adapted from: https://youtu.be/qWESrvP_uU8
 # Adapted from: https://github.com/ChrisTitusTech/win10script
@@ -76,9 +76,6 @@ function Optimize-ServicesRunning() {
         "XblGameSave"                    # DEFAULT: Manual    | Xbox Live Game Save
         "XboxGipSvc"                     # DEFAULT: Manual    | Xbox Accessory Management Service
         "XboxNetApiSvc"                  # DEFAULT: Manual    | Xbox Live Networking Service
-        <# NVIDIA services #>
-        "NVDisplay.ContainerLocalSystem" # DEFAULT: Automatic | NVIDIA Display Container LS (NVIDIA Control Panel)
-        "NvContainerLocalSystem"         # DEFAULT: Automatic | NVIDIA LocalSystem Container (GeForce Experience / NVIDIA Telemetry)
         <# Printer services #>
         #"PrintNotify"                   # DEFAULT: Manual    | WARNING! REMOVING WILL TURN PRINTING LESS MANAGEABLE | Printer Extensions and Notifications
         #"Spooler"                       # DEFAULT: Automatic | WARNING! REMOVING WILL DISABLE PRINTING              | Print Spooler
diff --git a/src/scripts/Optimize-TaskScheduler.ps1 b/src/scripts/Optimize-TaskScheduler.ps1
index 8da6e730..91108688 100644
--- a/src/scripts/Optimize-TaskScheduler.ps1
+++ b/src/scripts/Optimize-TaskScheduler.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ScheduledTaskState.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ScheduledTaskState.psm1"
 
 # Adapted from: https://youtu.be/qWESrvP_uU8
 # Adapted from: https://github.com/ChrisTitusTech/win10script
diff --git a/src/scripts/Optimize-WindowsFeaturesList.ps1 b/src/scripts/Optimize-WindowsFeaturesList.ps1
index 426bea28..c5ad6e9c 100644
--- a/src/scripts/Optimize-WindowsFeaturesList.ps1
+++ b/src/scripts/Optimize-WindowsFeaturesList.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-OptionalFeatureState.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-OptionalFeatureState.psm1"
 
 # Adapted from: https://github.com/ChrisTitusTech/win10script/pull/131/files
 
diff --git a/src/scripts/Register-PersonalTweaksList.ps1 b/src/scripts/Register-PersonalTweaksList.ps1
index e587ad7f..a1e2dd35 100644
--- a/src/scripts/Register-PersonalTweaksList.ps1
+++ b/src/scripts/Register-PersonalTweaksList.ps1
@@ -1,8 +1,8 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Open-File.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\utils\"Individual-Tweaks.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Open-File.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\utils\Individual-Tweaks.psm1"
 
 # Adapted from: https://github.com/ChrisTitusTech/win10script
 # Adapted from: https://github.com/Sycnex/Windows10Debloater
diff --git a/src/scripts/Remove-BloatwareAppsList.ps1 b/src/scripts/Remove-BloatwareAppsList.ps1
index 7bd70e4c..cf88b2e3 100644
--- a/src/scripts/Remove-BloatwareAppsList.ps1
+++ b/src/scripts/Remove-BloatwareAppsList.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-UWPApp.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-UWPApp.psm1"
 
 function Remove-BloatwareAppsList() {
     $Apps = @(
diff --git a/src/scripts/Remove-CapabilitiesList.ps1 b/src/scripts/Remove-CapabilitiesList.ps1
index 00ae6783..0e0044f0 100644
--- a/src/scripts/Remove-CapabilitiesList.ps1
+++ b/src/scripts/Remove-CapabilitiesList.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-CapabilityState.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-CapabilityState.psm1"
 
 function Remove-CapabilitiesList() {
     [CmdletBinding()]
diff --git a/src/scripts/Remove-MSEdge.ps1 b/src/scripts/Remove-MSEdge.ps1
index 26e613a9..433a2b9f 100644
--- a/src/scripts/Remove-MSEdge.ps1
+++ b/src/scripts/Remove-MSEdge.ps1
@@ -1,8 +1,8 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\ui\"Show-MessageDialog.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-UWPApp.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-UWPApp.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\ui\Show-MessageDialog.psm1"
 
 function Remove-MSEdge() {
     $PathToLMEdgeUpdate = "HKLM:\SOFTWARE\Microsoft\EdgeUpdate"
diff --git a/src/scripts/Remove-OneDrive.ps1 b/src/scripts/Remove-OneDrive.ps1
index d5122041..70609072 100644
--- a/src/scripts/Remove-OneDrive.ps1
+++ b/src/scripts/Remove-OneDrive.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
 
 function Remove-OneDrive() {
     # Description: This script will remove and disable OneDrive integration.
diff --git a/src/scripts/Remove-Xbox.ps1 b/src/scripts/Remove-Xbox.ps1
index 48da962f..89dd5764 100644
--- a/src/scripts/Remove-Xbox.ps1
+++ b/src/scripts/Remove-Xbox.ps1
@@ -1,9 +1,9 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ServiceStartup.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\ui\"Show-MessageDialog.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-UWPApp.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\utils\"Individual-Tweaks.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-UWPApp.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ServiceStartup.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\ui\Show-MessageDialog.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\utils\Individual-Tweaks.psm1"
 
 function Remove-Xbox() {
     $PathToLMServicesXbgm = "HKLM:\SYSTEM\CurrentControlSet\Services\xbgm"
diff --git a/src/scripts/Repair-WindowsSystem.ps1 b/src/scripts/Repair-WindowsSystem.ps1
index 6547f01a..0d63343b 100644
--- a/src/scripts/Repair-WindowsSystem.ps1
+++ b/src/scripts/Repair-WindowsSystem.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
 
 # Adapted from: https://github.com/ChrisTitusTech/win10script
 
diff --git a/src/scripts/Use-DebloatSoftware.ps1 b/src/scripts/Use-DebloatSoftware.ps1
index b21c141b..ba201059 100644
--- a/src/scripts/Use-DebloatSoftware.ps1
+++ b/src/scripts/Use-DebloatSoftware.ps1
@@ -1,7 +1,7 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Get-TempScriptFolder.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Request-FileDownload.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Get-TempScriptFolder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Request-FileDownload.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-ItemVerified.psm1"
 
 # Adapted from this ChrisTitus script: https://github.com/ChrisTitusTech/win10script
 
@@ -13,9 +13,9 @@ function Use-DebloatSoftware() {
 
     If (!$Revert) {
         $AdwCleanerDl = "https://downloads.malwarebytes.com/file/adwcleaner"
-        [String] $AdwCleanerOutput = Request-FileDownload -FileURI $AdwCleanerDl -OutputFile "adwcleaner.exe"
+        $AdwCleanerOutput = (Request-FileDownload -FileURI $AdwCleanerDl -OutputFile "adwcleaner.exe")[-1]
         Write-Status -Types "+" -Status "Running MalwareBytes AdwCleaner scanner..."
-        Start-Process -FilePath $AdwCleanerOutput -ArgumentList "/eula", "/clean", "/noreboot" -Wait
+        Start-Process -FilePath "$AdwCleanerOutput" -ArgumentList '/eula', '/clean', '/noreboot' -Wait
         Remove-ItemVerified $AdwCleanerOutput -Force
     }
 
diff --git a/src/scripts/other-scripts/Git-GnupgSshKeysSetup.ps1 b/src/scripts/other-scripts/Git-GnupgSshKeysSetup.ps1
index 686adeb6..0e28e120 100644
--- a/src/scripts/other-scripts/Git-GnupgSshKeysSetup.ps1
+++ b/src/scripts/other-scripts/Git-GnupgSshKeysSetup.ps1
@@ -1,8 +1,8 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Manage-Software.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\ui\"Select-Folder.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\ui\"Show-MessageDialog.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Manage-Software.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\ui\Select-Folder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\ui\Show-MessageDialog.psm1"
 
 function Request-AdminPrivilege() {
     # Used from https://stackoverflow.com/a/31602095 because it preserves the working directory!
diff --git a/src/scripts/other-scripts/Install-ArchWSL.ps1 b/src/scripts/other-scripts/Install-ArchWSL.ps1
index 5e9cf67f..923cffb7 100644
--- a/src/scripts/other-scripts/Install-ArchWSL.ps1
+++ b/src/scripts/other-scripts/Install-ArchWSL.ps1
@@ -1,7 +1,7 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Get-HardwareInfo.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Request-FileDownload.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Get-HardwareInfo.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Request-FileDownload.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Remove-ItemVerified.psm1"
 
 function Install-ArchWSL() {
     $OSArchList = Get-OSArchitecture
diff --git a/src/scripts/other-scripts/Install-NerdFont.ps1 b/src/scripts/other-scripts/Install-NerdFont.ps1
index a46c55a4..a103dda5 100644
--- a/src/scripts/other-scripts/Install-NerdFont.ps1
+++ b/src/scripts/other-scripts/Install-NerdFont.ps1
@@ -1,8 +1,8 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Get-TempScriptFolder.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Install-Font.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Request-FileDownload.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Get-TempScriptFolder.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Install-Font.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Request-FileDownload.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Remove-ItemVerified.psm1"
 
 $FontsFolder = "fonts"
 
diff --git a/src/scripts/other-scripts/Install-WSL.ps1 b/src/scripts/other-scripts/Install-WSL.ps1
index 1d932b37..1e666baf 100644
--- a/src/scripts/other-scripts/Install-WSL.ps1
+++ b/src/scripts/other-scripts/Install-WSL.ps1
@@ -1,10 +1,10 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Get-HardwareInfo.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Manage-Software.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Request-FileDownload.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Set-OptionalFeatureState.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Get-HardwareInfo.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Manage-Software.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Request-FileDownload.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Set-OptionalFeatureState.psm1"
 
 function Install-WSL() {
     [CmdletBinding()] param()
diff --git a/src/scripts/other-scripts/New-SystemColor.ps1 b/src/scripts/other-scripts/New-SystemColor.ps1
index b211142e..faef47c4 100644
--- a/src/scripts/other-scripts/New-SystemColor.ps1
+++ b/src/scripts/other-scripts/New-SystemColor.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
 
 function New-SystemColor() {
     Begin {
diff --git a/src/scripts/other-scripts/Show-DebloatInfo.ps1 b/src/scripts/other-scripts/Show-DebloatInfo.ps1
index 4f40bf8c..f8a64f61 100644
--- a/src/scripts/other-scripts/Show-DebloatInfo.ps1
+++ b/src/scripts/other-scripts/Show-DebloatInfo.ps1
@@ -1,5 +1,5 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\ui\"Show-MessageDialog.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\ui\"Ui-Helper.psm1" # Load UI libs
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\ui\Show-MessageDialog.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\ui\Ui-Helper.psm1" # Load UI libs
 
 function Show-DebloatInfo() {
     [CmdletBinding()]
diff --git a/src/scripts/other-scripts/Update-AllPackage.ps1 b/src/scripts/other-scripts/Update-AllPackage.ps1
index 103bddc0..e1b8b4d2 100644
--- a/src/scripts/other-scripts/Update-AllPackage.ps1
+++ b/src/scripts/other-scripts/Update-AllPackage.ps1
@@ -1,4 +1,4 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\..\lib\"Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\..\lib\Title-Templates.psm1"
 
 function Update-AllPackage() {
     Write-Section "Upgrade all Packages"
diff --git a/src/utils/Individual-Tweaks.psm1 b/src/utils/Individual-Tweaks.psm1
index 12fe5789..dd49a0f2 100644
--- a/src/utils/Individual-Tweaks.psm1
+++ b/src/utils/Individual-Tweaks.psm1
@@ -1,13 +1,13 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Get-HardwareInfo.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Grant-RegistryPermission.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Manage-Software.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"New-Shortcut.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Remove-ItemVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-CapabilityState.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-OptionalFeatureState.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ServiceStartup.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Get-HardwareInfo.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Grant-RegistryPermission.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Manage-Software.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\New-Shortcut.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Remove-ItemVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-CapabilityState.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-OptionalFeatureState.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ServiceStartup.psm1"
 
 $DesktopPath = [Environment]::GetFolderPath("Desktop");
 $PathToLMPoliciesCloudContent = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent"
diff --git a/src/utils/Install-Individual-System-Apps.psm1 b/src/utils/Install-Individual-System-Apps.psm1
index c6720610..4d9c6504 100644
--- a/src/utils/Install-Individual-System-Apps.psm1
+++ b/src/utils/Install-Individual-System-Apps.psm1
@@ -1,7 +1,7 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Manage-Software.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"Title-Templates.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\debloat-helper\"Set-ItemPropertyVerified.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\utils\"Individual-Tweaks.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Manage-Software.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\Title-Templates.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\lib\debloat-helper\Set-ItemPropertyVerified.psm1"
+Import-Module -DisableNameChecking "$PSScriptRoot\..\utils\Individual-Tweaks.psm1"
 
 $Script:TweakType = "App"