merge lockscreen scripts

scripts/disable-logon-background.ps1

@@ -1,10 +0,0 @@
-#   Description:
-# This script will disable the login screen background image.
-
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\reg-helper.psm1
-
-echo "Disabling login screen background image"
-Import-Registry(@"
-[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\System]
-"DisableLogonBackgroundImage"=dword:00000001
-"@)

scripts/disable-new-lockscreen.ps1

@@ -1,10 +0,0 @@
-#   Description:
-# This script disables the new lock screen via Group Policies.
-
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\reg-helper.psm1
-
-echo "Disabling new lock screen"
-Import-Registry(@"
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Personalization]
-"NoLockScreen"=dword:00000001
-"@)

scripts/optimize-lockscreen.ps1

@@ -0,0 +1,17 @@
+#   Description:
+# This script disables the new lock screen and login screen background
+# image.
+
+Import-Module -DisableNameChecking $PSScriptRoot\..\lib\reg-helper.psm1
+
+echo "Disabling login screen background image"
+Import-Registry(@"
+[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\System]
+"DisableLogonBackgroundImage"=dword:00000001
+"@)
+
+echo "Disabling new lock screen"
+Import-Registry(@"
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Personalization]
+"NoLockScreen"=dword:00000001
+"@)