diff --git a/setup.ps1 b/setup.ps1
index 13d2c2f..3468774 100644
--- a/setup.ps1
+++ b/setup.ps1
@@ -1,7 +1,7 @@
 
 ## NOT TESTED ##
 
-Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe
+#Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe
 
 #Install WinGet
 ## WinGet should be on any windows 11 install by default
@@ -87,41 +87,21 @@ do {
                 @{name = 'Git.Git' },
                 @{name = 'Google.Chrome' },
                 @{name = 'TorProject.TorBrowser'},
-                @{name = 'Google.Drive' },
+                @{name = 'Google.GoogleDrive' },
                 @{name = 'Hugo.Hugo.Extended' },
                 @{name = 'Bitwarden.Bitwarden' },
                 @{name = 'Sinew.Enpass'}, # Temp until everything moved to bitwarden
                 @{name = 'Plex.Plex' },
                 @{name = 'Microsoft.MouseWithoutBorders'},
-                @{name = 'VivaldiTechnologies.Vivaldi' },
+                @{name = 'Vivaldi.Vivaldi' },
                 @{name = 'VideoLAN.VLC' },
                 @{name = 'PointPlanck.FileBot' },
                 @{name = 'Oracle.VirtualBox' },
-                @{name = 'NordVPN.NordVPN' },
-                @{name = 'Facebook.Messenger' },
+                @{name = 'NordSecurity.NordVPN' },
+#                @{name = 'Facebook.Messenger' }, # Cant find via winget anymore?
                 @{name = 'Microsoft.Office' },
                 @{name = 'Malwarebytes.Malwarebytes '}
             )
-<#
- # {            Foreach ($app in $apps) {
-                $listApp = winget list --exact -q $app.name
-                if (![String]::Join("", $listApp).Contains($app.name)) {
-                Write-host "Installing:" $app.name
-                if ($null -ne $app.source) {
-                winget install --exact $app.name --source $app.source
-                #            winget install --exact --silent $app.name --source $app.source
-                }
-                else {
-                winget install --exact $app.name
-                #            winget install --exact --silent $app.name
-                }
-                }
-                else {
-                Write-host "Skipping Install of " $app.name
-                }
-                }
-                :Enter a comment or description}
-#>
             InstallTheApps $Apps
         }
         "2" {
@@ -132,24 +112,7 @@ do {
                 @{name = 'GOG.Galaxy '},
                 @{name = 'Discord.Discord '}
             )
-            Foreach ($app in $apps) {
-                $listApp = winget list --exact -q $app.name
-                if (![String]::Join("", $listApp).Contains($app.name)) {
-                Write-host "Installing:" $app.name
-                if ($null -ne $app.source) {
-                winget install --exact $app.name --source $app.source
-                #            winget install --exact --silent $app.name --source $app.source
-                }
-                else {
-                winget install --exact $app.name
-                #            winget install --exact --silent $app.name
-                }
-                }
-                else {
-                Write-host "Skipping Install of " $app.name
-                }
-                }
-            #InstallTheApps $Apps
+            InstallTheApps $Apps
         }        
         "3" {
             $apps = @( ## DESKTOP
@@ -158,50 +121,16 @@ do {
                 @{name = 'Asus.ArmouryCrate '},
                 @{name = 'Nvidia.GeForceExperience '}
             )
-            Foreach ($app in $apps) {
-                $listApp = winget list --exact -q $app.name
-                if (![String]::Join("", $listApp).Contains($app.name)) {
-                Write-host "Installing:" $app.name
-                if ($null -ne $app.source) {
-                winget install --exact $app.name --source $app.source
-                #            winget install --exact --silent $app.name --source $app.source
-                }
-                else {
-                winget install --exact $app.name
-                #            winget install --exact --silent $app.name
-                }
-                }
-                else {
-                Write-host "Skipping Install of " $app.name
-                }
-                }
-            #InstallTheApps $Apps
+           InstallTheApps $Apps
         }
         "4" { $apps = @( ## LAPTOP
                 @{name = 'Intel.IntelDriverAndSupportAssistant' },
                 @{name = '9WZDNCRFJ4MV'; source = 'msstore' }, # Lenovo Vantage from MS Store
                 @{name = 'j5create.Driver-JUA365' } ## Not sure if this is correct yet!
                 )
-                    Foreach ($app in $apps) {
-                    $listApp = winget list --exact -q $app.name
-                    if (![String]::Join("", $listApp).Contains($app.name)) {
-                    Write-host "Installing:" $app.name
-                    if ($null -ne $app.source) {
-                    winget install --exact $app.name --source $app.source
-                    #            winget install --exact --silent $app.name --source $app.source
-                    }
-                    else {
-                    winget install --exact $app.name
-                    #            winget install --exact --silent $app.name
-                    }
-                    }
-                    else {
-                    Write-host "Skipping Install of " $app.name
-                    }
-                    
-            #InstallTheApps $Apps
+                InstallTheApps $Apps
                 }
-            }
+            
 
         '5' {
             ## REMOVE CRAP