v3.0, 2018-09-15, BYOT - Bring your own tweaks

 - Split execution logic from tweak library and add support for custom tweaks
 - Check "Advanced usage" chapter in README

Author: Disassembler0

Default.cmd

@@ -1,3 +1,3 @@
 @ECHO OFF
 
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0Win10.ps1" -preset "%~dpn0.preset"
+powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0Win10.ps1" -include "%~dp0Win10.psm1" -preset "%~dpn0.preset"

Default.preset

@@ -1,153 +1,168 @@
-# Default preset
+##########
+# Win10 / WinServer2016 Initial Setup Script - Default preset
+# Author: Disassembler <[email protected]>
+# Version: v3.0, 2018-09-15
+# Source: https://github.com/Disassembler0/Win10-Initial-Setup-Script
+##########
 
+### Require administrator privileges ###
 RequireAdmin
 
-DisableTelemetry
-DisableWiFiSense
-# DisableSmartScreen
-DisableWebSearch
-DisableAppSuggestions
-DisableActivityHistory
-DisableBackgroundApps
-DisableLocationTracking
-DisableMapUpdates
-DisableFeedback
-DisableTailoredExperiences
-DisableAdvertisingID
-DisableWebLangList
-DisableCortana
-DisableErrorReporting
-# SetP2PUpdateLocal
-DisableDiagTrack
-DisableWAPPush
-# HideRecentJumplists
+### Privacy Tweaks ###
+DisableTelemetry             # EnableTelemetry
+DisableWiFiSense             # EnableWiFiSense
+# DisableSmartScreen         # EnableSmartScreen
+DisableWebSearch             # EnableWebSearch
+DisableAppSuggestions        # EnableAppSuggestions
+DisableActivityHistory       # EnableActivityHistory
+DisableBackgroundApps        # EnableBackgroundApps
+DisableLocationTracking      # EnableLocationTracking
+DisableMapUpdates            # EnableMapUpdates
+DisableFeedback              # EnableFeedback
+DisableTailoredExperiences   # EnableTailoredExperiences
+DisableAdvertisingID         # EnableAdvertisingID
+DisableWebLangList           # EnableWebLangList
+DisableCortana               # EnableCortana
+DisableErrorReporting        # EnableErrorReporting
+# SetP2PUpdateLocal          # SetP2PUpdateInternet        # SetP2PUpdateDisable
+DisableDiagTrack             # EnableDiagTrack
+DisableWAPPush               # EnableWAPPush
+# HideRecentJumplists        # ShowRecentJumplists
 
-# SetUACLow
-# EnableSharingMappedDrives
-DisableAdminShares
-# DisableSMB1
-# DisableSMBServer
-# DisableLLMNR
-# DisableNCSIProbe
-SetCurrentNetworkPrivate
-# SetUnknownNetworksPrivate
-# DisableNetDevicesAutoInst
-# EnableCtrldFolderAccess
-# DisableFirewall
-# DisableDefender
-# DisableDefenderCloud
-EnableF8BootMenu
-SetDEPOptOut
-# EnableCIMemoryIntegrity
-DisableScriptHost
-EnableDotNetStrongCrypto
-# EnableMeltdownCompatFlag
+### Security Tweaks ###
+# SetUACLow                  # SetUACHigh
+# EnableSharingMappedDrives  # DisableSharingMappedDrives
+DisableAdminShares           # EnableAdminShares
+# DisableSMB1                # EnableSMB1
+# DisableSMBServer           # EnableSMBServer
+# DisableLLMNR               # EnableLLMNR
+# DisableNCSIProbe           # EnableNCSIProbe
+SetCurrentNetworkPrivate     # SetCurrentNetworkPublic
+# SetUnknownNetworksPrivate  # SetUnknownNetworksPublic
+# DisableNetDevicesAutoInst  # EnableNetDevicesAutoInst
+# EnableCtrldFolderAccess    # DisableCtrldFolderAccess
+# DisableFirewall            # EnableFirewall
+# DisableDefender            # EnableDefender
+# DisableDefenderCloud       # EnableDefenderCloud
+EnableF8BootMenu             # DisableF8BootMenu
+SetDEPOptOut                 # SetDEPOptIn
+# EnableCIMemoryIntegrity    # DisableCIMemoryIntegrity
+DisableScriptHost            # EnableScriptHost
+EnableDotNetStrongCrypto     # DisableDotNetStrongCrypto
+# EnableMeltdownCompatFlag   # DisableMeltdownCompatFlag
 
-# DisableUpdateMSRT
-# DisableUpdateDriver
-DisableUpdateRestart
-# DisableHomeGroups
-DisableSharedExperiences
-DisableRemoteAssistance
-EnableRemoteDesktop
-DisableAutoplay
-DisableAutorun
-# EnableStorageSense
-# DisableDefragmentation
-# DisableSuperfetch
-# DisableIndexing
-# SetBIOSTimeUTC
-# EnableHibernation
-# DisableSleepButton
-# DisableSleepTimeout
-# DisableFastStartup
+### Service Tweaks ###
+# DisableUpdateMSRT          # EnableUpdateMSRT
+# DisableUpdateDriver        # EnableUpdateDriver
+DisableUpdateRestart         # EnableUpdateRestart
+# DisableHomeGroups          # EnableHomeGroups
+DisableSharedExperiences     # EnableSharedExperiences
+DisableRemoteAssistance      # EnableRemoteAssistance
+EnableRemoteDesktop          # DisableRemoteDesktop
+DisableAutoplay              # EnableAutoplay
+DisableAutorun               # EnableAutorun
+# EnableStorageSense         # DisableStorageSense
+# DisableDefragmentation     # EnableDefragmentation
+# DisableSuperfetch          # EnableSuperfetch
+# DisableIndexing            # EnableIndexing
+# SetBIOSTimeUTC             # SetBIOSTimeLocal
+# EnableHibernation          # DisableHibernation
+# DisableSleepButton         # EnableSleepButton
+# DisableSleepTimeout        # EnableSleepTimeout
+# DisableFastStartup         # EnableFastStartup
 
-DisableActionCenter
-HideAccountProtectionWarn
-DisableLockScreen
-# DisableLockScreenRS1
-HideNetworkFromLockScreen
-HideShutdownFromLockScreen
-DisableStickyKeys
-ShowTaskManagerDetails
-ShowFileOperationsDetails
-# EnableFileDeleteConfirm
-HideTaskbarSearch
-HideTaskView
-ShowSmallTaskbarIcons
-SetTaskbarCombineWhenFull
-HideTaskbarPeopleIcon
-ShowTrayIcons
-DisableSearchAppInStore
-DisableNewAppPrompt
-# HideRecentlyAddedApps
-# SetControlPanelSmallIcons
-SetVisualFXPerformance
-# AddENKeyboard
-# EnableNumlock
-# SetSoundSchemeNone
-# DisableStartupSound
-# DisableChangingSoundScheme
+### UI Tweaks ###
+DisableActionCenter          # EnableActionCenter
+HideAccountProtectionWarn    # ShowAccountProtectionWarn
+DisableLockScreen            # EnableLockScreen
+# DisableLockScreenRS1       # EnableLockScreenRS1
+HideNetworkFromLockScreen    # ShowNetworkOnLockScreen
+HideShutdownFromLockScreen   # ShowShutdownOnLockScreen
+DisableStickyKeys            # EnableStickyKeys
+ShowTaskManagerDetails       # HideTaskManagerDetails
+ShowFileOperationsDetails    # HideFileOperationsDetails
+# EnableFileDeleteConfirm    # DisableFileDeleteConfirm
+HideTaskbarSearch            # ShowTaskbarSearchIcon       # ShowTaskbarSearchBox
+HideTaskView                 # ShowTaskView
+ShowSmallTaskbarIcons        # ShowLargeTaskbarIcons
+SetTaskbarCombineWhenFull    # SetTaskbarCombineNever      # SetTaskbarCombineAlways
+HideTaskbarPeopleIcon        # ShowTaskbarPeopleIcon
+ShowTrayIcons                # HideTrayIcons
+DisableSearchAppInStore      # EnableSearchAppInStore
+DisableNewAppPrompt          # EnableNewAppPrompt
+# HideRecentlyAddedApps      # ShowRecentlyAddedApps
+# SetControlPanelSmallIcons  # SetControlPanelLargeIcons   # SetControlPanelCategories
+SetVisualFXPerformance       # SetVisualFXAppearance
+# AddENKeyboard              # RemoveENKeyboard
+# EnableNumlock              # DisableNumlock
+# SetSoundSchemeNone         # SetSoundSchemeDefault
+# DisableStartupSound        # EnableStartupSound
+# DisableChangingSoundScheme # EnableChangingSoundScheme
 
-ShowKnownExtensions
-ShowHiddenFiles
-# EnableFldrSeparateProcess
-# EnableRestoreFldrWindows
-# DisableSharingWizard
-HideSelectCheckboxes
-HideSyncNotifications
-HideRecentShortcuts
-SetExplorerThisPC
-HideQuickAccess
-ShowThisPCOnDesktop
-# ShowUserFolderOnDesktop
-HideDesktopFromThisPC
-# HideDesktopFromExplorer
-HideDocumentsFromThisPC
-# HideDocumentsFromExplorer
-HideDownloadsFromThisPC
-# HideDownloadsFromExplorer
-HideMusicFromThisPC
-# HideMusicFromExplorer
-HidePicturesFromThisPC
-# HidePicturesFromExplorer
-HideVideosFromThisPC
-# HideVideosFromExplorer
-Hide3DObjectsFromThisPC
-# Hide3DObjectsFromExplorer
-# DisableThumbnails
-DisableThumbnailCache
-DisableThumbsDBOnNetwork
+### Explorer UI Tweaks ###
+ShowKnownExtensions          # HideKnownExtensions
+ShowHiddenFiles              # HideHiddenFiles
+# EnableFldrSeparateProcess  # DisableFldrSeparateProcess
+# EnableRestoreFldrWindows   # DisableRestoreFldrWindows
+# DisableSharingWizard       # EnableSharingWizard
+# HideSelectCheckboxes       # ShowSelectCheckboxes
+HideSyncNotifications        # ShowSyncNotifications
+HideRecentShortcuts          # ShowRecentShortcuts
+SetExplorerThisPC            # SetExplorerQuickAccess
+HideQuickAccess              # ShowQuickAccess
+ShowThisPCOnDesktop          # HideThisPCFromDesktop
+# ShowUserFolderOnDesktop    # HideUserFolderFromDesktop
+HideDesktopFromThisPC        # ShowDesktopInThisPC
+# HideDesktopFromExplorer    # ShowDesktopInExplorer
+HideDocumentsFromThisPC      # ShowDocumentsInThisPC
+# HideDocumentsFromExplorer  # ShowDocumentsInExplorer
+HideDownloadsFromThisPC      # ShowDownloadsInThisPC
+# HideDownloadsFromExplorer  # ShowDownloadsInExplorer
+HideMusicFromThisPC          # ShowMusicInThisPC
+# HideMusicFromExplorer      # ShowMusicInExplorer
+HidePicturesFromThisPC       # ShowPicturesInThisPC
+# HidePicturesFromExplorer   # ShowPicturesInExplorer
+HideVideosFromThisPC         # ShowVideosInThisPC
+# HideVideosFromExplorer     # ShowVideosInExplorer
+Hide3DObjectsFromThisPC      # Show3DObjectsInThisPC
+# Hide3DObjectsFromExplorer  # Show3DObjectsInExplorer
+# DisableThumbnails          # EnableThumbnails
+DisableThumbnailCache        # EnableThumbnailCache
+DisableThumbsDBOnNetwork     # EnableThumbsDBOnNetwork
 
-DisableOneDrive
-UninstallOneDrive
-UninstallMsftBloat
-UninstallThirdPartyBloat
-# UninstallWindowsStore
-DisableXboxFeatures
-DisableAdobeFlash
-DisableEdgeShortcutCreation
-# UninstallMediaPlayer
-# UninstallInternetExplorer
-# UninstallWorkFolders
-# InstallLinuxSubsystem
-# InstallHyperV
-SetPhotoViewerAssociation
-AddPhotoViewerOpenWith
-# UninstallPDFPrinter
-UninstallXPSPrinter
-RemoveFaxPrinter
-# UninstallFaxAndScan
+### Application Tweaks ###
+DisableOneDrive              # EnableOneDrive
+UninstallOneDrive            # InstallOneDrive
+UninstallMsftBloat           # InstallMsftBloat
+UninstallThirdPartyBloat     # InstallThirdPartyBloat
+# UninstallWindowsStore      # InstallWindowsStore
+DisableXboxFeatures          # EnableXboxFeatures
+DisableAdobeFlash            # EnableAdobeFlash
+DisableEdgeShortcutCreation  # EnableEdgeShortcutCreation
+# UninstallMediaPlayer       # InstallMediaPlayer
+# UninstallInternetExplorer  # InstallInternetExplorer
+# UninstallWorkFolders       # InstallWorkFolders
+# InstallLinuxSubsystem      # UninstallLinuxSubsystem
+# InstallHyperV              # UninstallHyperV
+SetPhotoViewerAssociation    # UnsetPhotoViewerAssociation
+AddPhotoViewerOpenWith       # RemovePhotoViewerOpenWith
+# UninstallPDFPrinter        # InstallPDFPrinter
+UninstallXPSPrinter          # InstallXPSPrinter
+RemoveFaxPrinter             # AddFaxPrinter
+# UninstallFaxAndScan        # InstallFaxAndScan
 
-# HideServerManagerOnLogin
-# DisableShutdownTracker
-# DisablePasswordPolicy
-# DisableCtrlAltDelLogin
-# DisableIEEnhancedSecurity
-# EnableAudio
+### Server Specific Tweaks ###
+# HideServerManagerOnLogin   # ShowServerManagerOnLogin
+# DisableShutdownTracker     # EnableShutdownTracker
+# DisablePasswordPolicy      # EnablePasswordPolicy
+# DisableCtrlAltDelLogin     # EnableCtrlAltDelLogin
+# DisableIEEnhancedSecurity  # EnableIEEnhancedSecurity
+# EnableAudio                # DisableAudio
 
+### Unpinning ###
 # UnpinStartMenuTiles
 # UnpinTaskbarIcons
 
+### Auxiliary Functions ###
 WaitForKey
 Restart