Update

Examples/Example-15-AddPermission02.ps1

@@ -1,3 +1,10 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-Add-GPOZaurrPermission -GPOName 'New Group Policy Object' -Type AuthenticatedUsers -PermissionType GpoRead -Verbose -WhatIf
+# Change per one GPO
+Add-GPOZaurrPermission -GPOName 'New Group Policy Object' -Type AuthenticatedUsers -PermissionType GpoRead -Verbose -WhatIf
+
+# Add to ALL GPOs that need it
+Add-GPOZaurrPermission -Type AuthenticatedUsers -PermissionType GpoRead -All -WhatIf -Verbose
+
+# Add Domain Admins/Enterprise Admins to all that need it
+Add-GPOZaurrPermission -Type Administrative -PermissionType GpoEditDeleteModifySecurity -All -WhatIf -Verbose

Examples/Example-20-RemoveOrphanedFoldersSysvol.ps1

@@ -4,7 +4,7 @@
 Get-GPOZaurrBroken -Verbose -IncludeDomains 'ad.evotec.pl' | Format-Table
 
 # this allows you to process X amount of orphaned folders/files (good for testing)
-Remove-GPOZaurrBroken -Verbose -WhatIf -IncludeDomains 'ad.evotec.pl' #-LimitProcessing 2
+Remove-GPOZaurrBroken -Verbose -WhatIf #-IncludeDomains 'ad.evotec.pl' #-LimitProcessing 2
 
 # this runs for whole SYSVOL and checks things against GPOS
 Remove-GPOZaurrBroken -Verbose -IncludeDomains 'ad.evotec.xyz' -BackupPath $Env:UserProfile\Desktop\MyBackup1 -WhatIf

GPOZaurr.psd1

@@ -8,7 +8,7 @@
     Description          = 'Group Policy Eater is a PowerShell module that aims to gather information about Group Policies but also allows fixing issues that you may find in them.'
     FunctionsToExport    = @('Add-GPOPermission', 'Add-GPOZaurrPermission', 'Backup-GPOZaurr', 'Clear-GPOZaurrSysvolDFSR', 'ConvertFrom-CSExtension', 'Find-CSExtension', 'Get-GPOZaurr', 'Get-GPOZaurrAD', 'Get-GPOZaurrBackupInformation', 'Get-GPOZaurrBroken', 'Get-GPOZaurrDictionary', 'Get-GPOZaurrDuplicateObject', 'Get-GPOZaurrFiles', 'Get-GPOZaurrFilesPolicyDefinition', 'Get-GPOZaurrFolders', 'Get-GPOZaurrInheritance', 'Get-GPOZaurrLegacyFiles', 'Get-GPOZaurrLink', 'Get-GPOZaurrLinkSummary', 'Get-GPOZaurrNetLogon', 'Get-GPOZaurrOwner', 'Get-GPOZaurrPassword', 'Get-GPOZaurrPermission', 'Get-GPOZaurrPermissionConsistency', 'Get-GPOZaurrPermissionIssue', 'Get-GPOZaurrPermissionRoot', 'Get-GPOZaurrPermissionSummary', 'Get-GPOZaurrSysvolDFSR', 'Get-GPOZaurrWMI', 'Invoke-GPOZaurr', 'Invoke-GPOZaurrContent', 'Invoke-GPOZaurrPermission', 'Invoke-GPOZaurrSupport', 'New-GPOZaurrWMI', 'Optimize-GPOZaurr', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrBroken', 'Remove-GPOZaurrDuplicateObject', 'Remove-GPOZaurrFolders', 'Remove-GPOZaurrLegacyFiles', 'Remove-GPOZaurrPermission', 'Remove-GPOZaurrWMI', 'Repair-GPOZaurrNetLogonOwner', 'Repair-GPOZaurrPermissionConsistency', 'Restore-GPOZaurr', 'Save-GPOZaurrFiles', 'Set-GPOOwner', 'Set-GPOZaurrOwner')
     GUID                 = 'f7d4c9e4-0298-4f51-ad77-e8e3febebbde'
-    ModuleVersion        = '0.0.86'
+    ModuleVersion        = '0.0.93'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{
@@ -18,7 +18,7 @@
         }
     }
     RequiredModules      = @(@{
-            ModuleVersion = '0.0.188'
+            ModuleVersion = '0.0.189'
             ModuleName    = 'PSSharedGoods'
             Guid          = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe'
         }, @{

Private/Get-PermissionsAnalysis.ps1

@@ -0,0 +1,59 @@
+function Get-PermissionsAnalysis {
+    [cmdletBinding()]
+    param(
+        [PSCustomObject] $GPOPermissions,
+        [validateset('WellKnownAdministrative', 'Administrative', 'AuthenticatedUsers', 'Default')][string] $Type = 'Default',
+        [Parameter(Mandatory)][alias('IncludePermissionType')][Microsoft.GroupPolicy.GPPermissionType] $PermissionType,
+
+        [alias('ForestName')][string] $Forest,
+        [string[]] $ExcludeDomains,
+        [alias('Domain', 'Domains')][string[]] $IncludeDomains,
+        [System.Collections.IDictionary] $ExtendedForestInformation,
+        [System.Collections.IDictionary] $ADAdministrativeGroups
+    )
+    if (-not $ADAdministrativeGroups) {
+        $ADAdministrativeGroups = Get-ADADministrativeGroups -Type DomainAdmins, EnterpriseAdmins -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation
+    }
+    $AdministrativeExists = @{
+        Skip             = $false
+        DomainAdmins     = $false
+        EnterpriseAdmins = $false
+    }
+    #$GPOPermissions = $_
+    # Verification Phase
+    # When it has GPOSecurityPermissionItem property it means it has permissions, if it doesn't it means we have clean object to process
+    if ($GPOPermissions.GPOSecurityPermissionItem) {
+        # Permission exists, but may be incomplete
+        foreach ($GPOPermission in $GPOPermissions) {
+            if ($Type -eq 'Default') {
+                # We were looking for specific principal and we got it. nothing to do
+                # this is for standard users such as przemyslaw.klys / adam.gonzales
+                $AdministrativeExists['Skip'] = $true
+                break
+            } elseif ($Type -eq 'Administrative') {
+                # We are looking for administrative but we need to make sure we got correct administrative
+                if ($GPOPermission.Permission -eq $PermissionType) {
+                    $AdministrativeGroup = $ADAdministrativeGroups['BySID'][$GPOPermission.PrincipalSid]
+                    if ($AdministrativeGroup.SID -like '*-519') {
+                        $AdministrativeExists['EnterpriseAdmins'] = $true
+                    } elseif ($AdministrativeGroup.SID -like '*-512') {
+                        $AdministrativeExists['DomainAdmins'] = $true
+                    }
+                }
+                if ($AdministrativeExists['DomainAdmins'] -and $AdministrativeExists['EnterpriseAdmins']) {
+                    $AdministrativeExists['Skip'] = $true
+                    break
+                }
+            } elseif ($Type -eq 'WellKnownAdministrative') {
+                # this is for SYSTEM account
+                $AdministrativeExists['Skip'] = $true
+                break
+            } elseif ($Type -eq 'AuthenticatedUsers') {
+                # this is for Authenticated Users
+                $AdministrativeExists['Skip'] = $true
+                break
+            }
+        }
+    }
+    $AdministrativeExists
+}

Private/Get-XMLGPO.ps1

@@ -7,7 +7,8 @@
         [switch] $OwnerOnly,
         [System.Collections.IDictionary] $ADAdministrativeGroups,
         [string] $Splitter = [System.Environment]::NewLine,
-        [switch] $ReturnObject
+        [switch] $ReturnObject,
+        [System.Collections.IDictionary] $ExcludeGroupPolicies
     )
     if ($XMLContent.GPO.LinksTo) {
         $LinkSplit = ([Array] $XMLContent.GPO.LinksTo).Where( { $_.Enabled -eq $true }, 'Split')
@@ -27,30 +28,35 @@
         $LinksDisabledCount = 0
         $LinksTotalCount = 0
     }
-    #if ($null -eq $XMLContent.GPO.Computer.ExtensionData -and $null -eq $XMLContent.GPO.User.ExtensionData) {
-    #    $Empty = $true
-    #} else {
-    #    $Empty = $false
-    #}
     # Find proper values for enabled/disabled user/computer settings
     if ($XMLContent.GPO.Computer.Enabled -eq 'False') {
         $ComputerEnabled = $false
     } elseif ($XMLContent.GPO.Computer.Enabled -eq 'True') {
         $ComputerEnabled = $true
+    } else {
+        Write-Warning "Get-XMLGPO - Computer enabled not set to true or false. Weird."
+        $ComputerEnabled = $null
     }
     if ($XMLContent.GPO.User.Enabled -eq 'False') {
         $UserEnabled = $false
     } elseif ($XMLContent.GPO.User.Enabled -eq 'True') {
         $UserEnabled = $true
+    } else {
+        Write-Warning "Get-XMLGPO - User enabled not set to true or false. Weird."
+        $UserEnabled = $null
     }
     # Translate Enabled to same as GPO GUI
     if ($UserEnabled -eq $True -and $ComputerEnabled -eq $true) {
+        $EnabledBool = $true
         $Enabled = 'Enabled'
     } elseif ($UserEnabled -eq $false -and $ComputerEnabled -eq $false) {
+        $EnabledBool = $false
         $Enabled = 'All settings disabled'
     } elseif ($UserEnabled -eq $true -and $ComputerEnabled -eq $false) {
+        $EnabledBool = $True
         $Enabled = 'Computer configuration settings disabled'
     } elseif ($UserEnabled -eq $false -and $ComputerEnabled -eq $true) {
+        $EnabledBool = $True
         $Enabled = 'User configuration settings disabled'
     }
 
@@ -58,9 +64,9 @@
     $UserSettingsAvailable = if ($null -eq $XMLContent.GPO.User.ExtensionData) { $false } else { $true }
 
     if ($ComputerSettingsAvailable -eq $false -and $UserSettingsAvailable -eq $false) {
-        $Empty = $true
+        $NoSettings = $true
     } else {
-        $Empty = $false
+        $NoSettings = $false
     }
 
     # $OutputUser = $XMLContent.GPO.User.ExtensionData.Extension | Where-Object { $_.PSObject.Properties.TypeNameOfValue -in 'System.Xml.XmlElement', 'System.Object[]' }
@@ -72,7 +78,7 @@
             try {
                 $KeysToLoop = $ExtensionType | Get-Member -MemberType Properties -ErrorAction Stop | Where-Object { $_.Name -notin 'type', $GPOSettingTypeSplit[0] -and $_.Name -notin @('Blocked') }
             } catch {
-                Write-Warning "Get-XMLStandard - things went sideways $($_.Exception.Message)"
+                Write-Warning "Get-XMLGPO - things went sideways $($_.Exception.Message)"
                 continue
             }
         }
@@ -84,7 +90,7 @@
             try {
                 $KeysToLoop = $ExtensionType | Get-Member -MemberType Properties -ErrorAction Stop | Where-Object { $_.Name -notin 'type', $GPOSettingTypeSplit[0] -and $_.Name -notin @('Blocked') }
             } catch {
-                Write-Warning "Get-XMLStandard - things went sideways $($_.Exception.Message)"
+                Write-Warning "Get-XMLGPO - things went sideways $($_.Exception.Message)"
                 continue
             }
         }
@@ -95,9 +101,9 @@
     $UserSettingsAvailableReal = if ($OutputUser) { $true } else { $false }
 
     if (-not $ComputerSettingsAvailableReal -and -not $UserSettingsAvailableReal) {
-        $EmptyMaybe = $true
+        $Empty = $true
     } else {
-        $EmptyMaybe = $false
+        $Empty = $false
     }
 
     $ComputerProblem = $false
@@ -126,8 +132,19 @@
         $UserProblem = $true
     }
 
+    if ($UserProblem -or $ComputerProblem) {
+        $Problem = $true
+    } else {
+        $Problem = $false
+    }
+    if ($UserOptimized -and $ComputerOptimized) {
+        $Optimized = $true
+    } else {
+        $Optimized = $false
+    }
+
     if (-not $PermissionsOnly) {
-        if ($XMLContent.GPO.SecurityDescriptor.Owner.Name.'#text') {
+        if ($ADAdministrativeGroups -and $XMLContent.GPO.SecurityDescriptor.Owner.Name.'#text') {
             $AdministrativeGroup = $ADAdministrativeGroups['ByNetBIOS']["$($XMLContent.GPO.SecurityDescriptor.Owner.Name.'#text')"]
             $WellKnown = ConvertFrom-SID -SID $XMLContent.GPO.SecurityDescriptor.Owner.SID.'#text' -OnlyWellKnown
             if ($AdministrativeGroup) {
@@ -137,8 +154,18 @@
             } else {
                 $OwnerType = 'NotAdministrative'
             }
-        } else {
+        } elseif ($ADAdministrativeGroups) {
             $OwnerType = 'Unknown'
+        } else {
+            $OwnerType = 'Unable to asses (local files?)'
+        }
+    }
+    # Mark GPO as excluded
+    $Exclude = $false
+    if ($ExcludeGroupPolicies) {
+        $PolicyWithDomain = -join ($XMLContent.GPO.Identifier.Domain.'#text', $XMLContent.GPO.Name)
+        if ($ExcludeGroupPolicies[$XMLContent.GPO.Name] -or $ExcludeGroupPolicies[$PolicyWithDomain]) {
+            $Exclude = $true
         }
     }
     if ($PermissionsOnly) {
@@ -189,32 +216,36 @@
             'DomainName'                        = $XMLContent.GPO.Identifier.Domain.'#text'
             'GUID'                              = $XMLContent.GPO.Identifier.Identifier.InnerText -replace '{' -replace '}'
             'Empty'                             = $Empty
-            'EmptyMaybe'                        = $EmptyMaybe
             'Linked'                            = $Linked
+            'Enabled'                           = $EnabledBool
+            'Optimized'                         = $Optimized
+            'Problem'                           = $Problem
+            'Exclude'                           = $Exclude
+            'ComputerPolicies'                  = $XMLContent.GPO.Computer.ExtensionData.Name -join ", "
+            'UserPolicies'                      = $XMLContent.GPO.User.ExtensionData.Name -join ", "
             'LinksCount'                        = $LinksTotalCount
             'LinksEnabledCount'                 = $LinksEnabledCount
             'LinksDisabledCount'                = $LinksDisabledCount
-            'Enabled'                           = $Enabled
-            'ComputerEnabled'                   = $ComputerEnabled
-            'ComputerOptimized'                 = $ComputerOptimized
+            'EnabledDetails'                    = $Enabled
             'ComputerProblem'                   = $ComputerProblem
-            'UserEnabled'                       = $UserEnabled
-            'UserOptimized'                     = $UserOptimized
+            'ComputerOptimized'                 = $ComputerOptimized
             'UserProblem'                       = $UserProblem
+            'UserOptimized'                     = $UserOptimized
             'ComputerSettingsAvailable'         = $ComputerSettingsAvailable
             'UserSettingsAvailable'             = $UserSettingsAvailable
             'ComputerSettingsAvailableReal'     = $ComputerSettingsAvailableReal
             'UserSettingsAvailableReal'         = $UserSettingsAvailableReal
             'ComputerSettingsTypes'             = $OutputComputer.Name
             'UserSettingsTypes'                 = $OutputUser.Name
+            'ComputerEnabled'                   = $ComputerEnabled
+            'UserEnabled'                       = $UserEnabled
             'ComputerSettingsStatus'            = if ($XMLContent.GPO.Computer.VersionDirectory -eq 0 -and $XMLContent.GPO.Computer.VersionSysvol -eq 0) { "NeverModified" } else { "Modified" }
             'ComputerSetttingsVersionIdentical' = if ($XMLContent.GPO.Computer.VersionDirectory -eq $XMLContent.GPO.Computer.VersionSysvol) { $true } else { $false }
             'ComputerSettings'                  = $XMLContent.GPO.Computer.ExtensionData.Extension
             'UserSettingsStatus'                = if ($XMLContent.GPO.User.VersionDirectory -eq 0 -and $XMLContent.GPO.User.VersionSysvol -eq 0) { "NeverModified" } else { "Modified" }
             'UserSettingsVersionIdentical'      = if ($XMLContent.GPO.User.VersionDirectory -eq $XMLContent.GPO.User.VersionSysvol) { $true } else { $false }
             'UserSettings'                      = $XMLContent.GPO.User.ExtensionData.Extension
-            'ComputerPolicies'                  = $XMLContent.GPO.Computer.ExtensionData.Name -join ", "
-            'UserPolicies'                      = $XMLContent.GPO.User.ExtensionData.Name -join ", "
+            'NoSettings'                        = $NoSettings
             'CreationTime'                      = [DateTime] $XMLContent.GPO.CreatedTime
             'ModificationTime'                  = [DateTime] $XMLContent.GPO.ModifiedTime
             'ReadTime'                          = [DateTime] $XMLContent.GPO.ReadTime

Private/Invoke.GPOZaurrConsistency.ps1

@@ -144,8 +144,8 @@
                                 Repair-GPOZaurrPermissionConsistency -LimitProcessing 2 -IncludeDomains "TargetDomain"
                             }
                             New-HTMLText -TextBlock {
-                                "This command when executed repairs only first X inconsistent permissions. Use LimitProcessing parameter to prevent mass fixing and increase the counter when no errors occur."
-                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
+                                "This command when executed repairs only first X inconsistent permissions. Use LimitProcessing parameter to prevent mass fixing and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly. "
                             }
                             New-HTMLText -Text "If there's nothing else to be fixed, we can skip to next step step"
                         }

Private/Invoke.GPOZaurrDuplicate.ps1

@@ -40,7 +40,7 @@
             }
             New-HTMLPanel {
                 New-HTMLChart {
-                    New-ChartLegend -Names 'Bad' -Color PaleGreen, Salmon
+                    New-ChartLegend -Names 'Bad' -Color Salmon
                     New-ChartBar -Name 'Duplicate (CNF) object' -Value $Script:Reporting['GPODuplicates']['Data'].Count
                 } -Title 'Duplicate (CNF) Objects' -TitleAlignment center
             }
@@ -61,7 +61,6 @@
         New-HTMLSection -Name 'Steps to fix - Remove duplicate (CNF) objects' {
             New-HTMLContainer {
                 New-HTMLSpanStyle -FontSize 10pt {
-                    New-HTMLText -Text 'Following steps will guide you how to remove duplicate objects'
                     New-HTMLWizard {
                         New-HTMLWizardStep -Name 'Prepare environment' {
                             New-HTMLText -Text "To be able to execute actions in automated way please install required modules. Those modules will be installed straight from Microsoft PowerShell Gallery."
@@ -77,8 +76,8 @@
                                 Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrDuplicateObjectsBefore.html -Verbose -Type GPODuplicates
                             }
                             New-HTMLText -Text {
-                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment."
-                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step."
+                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment. "
+                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step. "
                             }
                             New-HTMLText -Text "Alternatively if you prefer working with console you can run: "
                             New-HTMLCodeBlock -Code {
@@ -101,8 +100,8 @@
                                 Remove-GPOZaurrDuplicateObject -Verbose -LimitProcessing 2
                             }
                             New-HTMLText -TextBlock {
-                                "This command when executed removes only first X duplicate objects. Use LimitProcessing parameter to prevent mass delete and increase the counter when no errors occur."
-                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
+                                "This command when executed removes only first X duplicate objects. Use LimitProcessing parameter to prevent mass delete and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly. "
                             }
                         }
                         New-HTMLWizardStep -Name 'Verification report' {

Private/Invoke.GPOZaurrList.ps1

@@ -8,6 +8,11 @@
     }
     Processing = {
         foreach ($GPO in $Script:Reporting['GPOList']['Data']) {
+            if ($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false) {
+                $Script:Reporting['GPOList']['Variables']['GPONotValid']++
+            } else {
+                $Script:Reporting['GPOList']['Variables']['GPOValid']++
+            }
             if ($GPO.Linked -eq $false -and $GPO.Empty -eq $true) {
                 # Not linked, Empty
                 $Script:Reporting['GPOList']['Variables']['GPOEmptyAndUnlinked']++
@@ -32,14 +37,17 @@
                 $Script:Reporting['GPOList']['Variables']['GPOLinked']++
             } else {
                 # Linked, not EMPTY
-                $Script:Reporting['GPOList']['Variables']['GPOValid']++
                 $Script:Reporting['GPOList']['Variables']['GPOLinked']++
                 $Script:Reporting['GPOList']['Variables']['GPONotEmpty']++
             }
+            if ($GPO.Enabled -eq $true) {
+                $Script:Reporting['GPOList']['Variables']['GPOEnabled']++
+            } else {
+                $Script:Reporting['GPOList']['Variables']['GPODisabled']++
+            }
             if ($GPO.LinksDisabledCount -eq $GPO.LinksCount -and $GPO.LinksCount -gt 0) {
                 $Script:Reporting['GPOList']['Variables']['GPOLinkedButLinkDisabled']++
             }
-
             if ($GPO.ComputerOptimized -eq $true) {
                 $Script:Reporting['GPOList']['Variables']['ComputerOptimizedYes']++
             } else {
@@ -63,9 +71,19 @@
             if ($GPO.UserProblem -or $GPO.ComputerProblem) {
                 $Script:Reporting['GPOList']['Variables']['GPOWithProblems']++
             }
+            if ($GPO.Problem -eq $true) {
+                $Script:Reporting['GPOList']['Variables']['GPOProblem']++
+            } else {
+                $Script:Reporting['GPOList']['Variables']['GPONoProblem']++
+            }
+            if ($GPO.Optimized -eq $true) {
+                $Script:Reporting['GPOList']['Variables']['GPOOptimized']++
+            } else {
+                $Script:Reporting['GPOList']['Variables']['GPONotOptimized']++
+            }
         }
         $Script:Reporting['GPOList']['Variables']['GPOTotal'] = $Script:Reporting['GPOList']['Data'].Count
-        if ($Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked'] -gt 0) {
+        if ($Script:Reporting['GPOList']['Variables']['GPONotValid'] -gt 0) {
             $Script:Reporting['GPOList']['ActionRequired'] = $true
         } else {
             $Script:Reporting['GPOList']['ActionRequired'] = $false
@@ -81,6 +99,10 @@
         UserOptimizedNo          = 0
         UserProblemYes           = 0
         UserProblemNo            = 0
+        GPOOptimized             = 0
+        GPONotOptimized          = 0
+        GPOProblem               = 0
+        GPONoProblem             = 0
         GPONotLinked             = 0
         GPOLinked                = 0
         GPOEmpty                 = 0
@@ -88,36 +110,15 @@
         GPOEmptyAndUnlinked      = 0
         GPOEmptyOrUnlinked       = 0
         GPOLinkedButEmpty        = 0
+        GPOEnabled               = 0
+        GPODisabled              = 0
         GPOValid                 = 0
+        GPONotValid              = 0
         GPOLinkedButLinkDisabled = 0
         GPOTotal                 = 0
     }
     Overview   = {
-        New-HTMLPanel {
-            New-HTMLText -Text 'Following chart presents ', 'Linked / Empty and Unlinked Group Policies' -FontSize 10pt -FontWeight normal, bold
-            New-HTMLList -Type Unordered {
-                New-HTMLListItem -Text 'Group Policies total: ', $Script:Reporting['GPOList']['Variables']['GPOTotal'] -FontWeight normal, bold
-                New-HTMLListItem -Text "Group Policies valid: ", $Script:Reporting['GPOList']['Variables']['GPOValid'] -FontWeight normal, bold
-                New-HTMLListItem -Text "Group Policies to delete: ", $Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked'] -FontWeight normal, bold {
-                    New-HTMLList -Type Unordered {
-                        New-HTMLListItem -Text 'Group Policies that are unlinked (are not doing anything currently): ', $Script:Reporting['GPOList']['Variables']['GPONotLinked'] -FontWeight normal, bold
-                        New-HTMLListItem -Text "Group Policies that are empty (have no settings): ", $Script:Reporting['GPOList']['Variables']['GPOEmpty'] -FontWeight normal, bold
-                        New-HTMLListItem -Text "Group Policies that are linked, but empty: ", $Script:Reporting['GPOList']['Variables']['GPOLinkedButEmpty'] -FontWeight normal, bold
-                        New-HTMLListItem -Text "Group Policies that are linked, but link disabled: ", $Script:Reporting['GPOList']['Variables']['GPOLinkedButLinkDisabled'] -FontWeight normal, bold
-                    }
-                }
-            }
-            New-HTMLText -FontSize 10pt -Text 'Usually empty or unlinked Group Policies are safe to delete.'
-            New-HTMLChart -Title 'Group Policies Summary' {
-                New-ChartBarOptions -Type barStacked
-                #New-ChartLegend -Names 'Unlinked', 'Linked', 'Empty', 'Total' -Color Salmon, PaleGreen, PaleVioletRed, PaleTurquoise
-                New-ChartLegend -Names 'Good', 'Bad' -Color PaleGreen, Salmon
-                #New-ChartBar -Name 'Group Policies' -Value $Script:Reporting['GPOList']['Variables']['GPONotLinked'], $Script:Reporting['GPOList']['Variables']['GPOLinked'], $Script:Reporting['GPOList']['Variables']['GPOEmpty'], $Script:Reporting['GPOList']['Variables']['GPOTotal']
-                New-ChartBar -Name 'Linked' -Value $Script:Reporting['GPOList']['Variables']['GPOLinked'], $Script:Reporting['GPOList']['Variables']['GPONotLinked']
-                New-ChartBar -Name 'Empty' -Value $Script:Reporting['GPOList']['Variables']['GPONotEmpty'], $Script:Reporting['GPOList']['Variables']['GPOEmpty']
-                New-ChartBar -Name 'Valid' -Value $Script:Reporting['GPOList']['Variables']['GPOValid'], $Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked']
-            } -TitleAlignment center
-        }
+
     }
     Summary    = {
         New-HTMLText -TextBlock {
@@ -129,16 +130,32 @@
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Group Policies total: ', $Script:Reporting['GPOList']['Variables']['GPOTotal'] -FontWeight normal, bold
             New-HTMLListItem -Text "Group Policies valid: ", $Script:Reporting['GPOList']['Variables']['GPOValid'] -FontWeight normal, bold
-            New-HTMLListItem -Text "Group Policies to delete: ", $Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked'] -FontWeight normal, bold {
+            New-HTMLListItem -Text "Group Policies to delete: ", $Script:Reporting['GPOList']['Variables']['GPONotValid'] -FontWeight normal, bold {
                 New-HTMLList -Type Unordered {
                     New-HTMLListItem -Text 'Group Policies that are unlinked (are not doing anything currently): ', $Script:Reporting['GPOList']['Variables']['GPONotLinked'] -FontWeight normal, bold
                     New-HTMLListItem -Text "Group Policies that are empty (have no settings): ", $Script:Reporting['GPOList']['Variables']['GPOEmpty'] -FontWeight normal, bold
                     New-HTMLListItem -Text "Group Policies that are linked, but empty: ", $Script:Reporting['GPOList']['Variables']['GPOLinkedButEmpty'] -FontWeight normal, bold
                     New-HTMLListItem -Text "Group Policies that are linked, but link disabled: ", $Script:Reporting['GPOList']['Variables']['GPOLinkedButLinkDisabled'] -FontWeight normal, bold
+                    New-HTMLListItem -Text "Group Policies that are disabled (both user/computer sections): ", $Script:Reporting['GPOList']['Variables']['GPODisabled'] -FontWeight normal, bold
                 }
             }
         } -FontSize 10pt
-        New-HTMLText -Text "Additionally, we're reviewing Group Policies that have their section disabled, but contain data. Please review them and make sure this configuration is as expected!" -FontSize 10pt
+        New-HTMLText -Text "Keep in mind that each GPO can match multiple conditions such as being empty and unlinked and disabled at the same time. We're only deleting GPO once." -FontSize 10pt
+        New-HTMLText -Text @(
+            'All ',
+            'empty',
+            ' or ',
+            'unlinked',
+            ' or ',
+            'disabled',
+            ' Group Policies can be automatically deleted. Please review output in the table and follow steps below table to cleanup Group Policies. ',
+            'GPOs that have content, but are disabled require manual intervention. ',
+            "If performance is an issue you should consider disabling user or computer sections of GPO when those are not used. "
+        ) -FontSize 10pt -FontWeight normal, bold, normal, bold, normal, bold, normal, normal, normal, normal
+
+        New-HTMLText -LineBreak
+
+        New-HTMLText -Text "Additionally, we're reviewing Group Policies that have their section disabled, but contain data." -FontSize 10pt
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Group Policies with problems: ', $Script:Reporting['GPOList']['Variables']['GPOWithProblems'] -FontWeight normal, bold {
                 New-HTMLList -Type Unordered {
@@ -147,7 +164,15 @@
                 }
             }
         } -FontSize 10pt
-        New-HTMLText -Text "For best performance it's recommended that if there are no settings of certain kind (Computer or User settings) it's best to disable them. " -FontSize 10pt
+        New-HTMLText -Text @(
+            "Such policies require manual review from whoever owns them. "
+            "It could be a mistake tha section was disabled while containing data or that content is no longer needed in which case it should be deleted. "
+            "This can't be auto-handled and is INFORMATIONAL only. "
+        ) -FontSize 10pt
+
+        New-HTMLText -LineBreak
+
+        New-HTMLText -Text "Moreover, for best performance it's recommended that if there are no settings of certain kind (Computer or User settings) it's best to disable whole section. " -FontSize 10pt
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Group Policies with optimization: ' -FontWeight normal, bold {
                 New-HTMLList -Type Unordered {
@@ -162,11 +187,11 @@
                 }
             }
         } -FontSize 10pt
-        New-HTMLText -TextBlock {
-            'All empty or unlinked Group Policies can be automatically deleted. Please review output in the table and follow steps below table to cleanup Group Policies. '
-            'GPOs that have content, but are disabled require manual intervention. '
-            "If performance is an issue you should consider disabling user or computer sections of GPO when those are not used. "
-        } -FontSize 10pt
+        New-HTMLText -Text @(
+            "This means "
+            $Script:Reporting['GPOList']['Variables']['GPONotOptimized']
+            " could be optimized for performance reasons. "
+        ) -FontSize 10pt -FontWeight normal, bold, normal
     }
     Solution   = {
         New-HTMLSection -Invisible {
@@ -178,41 +203,52 @@
                     New-ChartBarOptions -Type barStacked
                     New-ChartLegend -Names 'Yes', 'No' -Color SpringGreen, Salmon
                     New-ChartBar -Name 'Linked' -Value $Script:Reporting['GPOList']['Variables']['GPOLinked'], $Script:Reporting['GPOList']['Variables']['GPONotLinked']
-                    New-ChartBar -Name 'Empty' -Value $Script:Reporting['GPOList']['Variables']['GPONotEmpty'], $Script:Reporting['GPOList']['Variables']['GPOEmpty']
-                    New-ChartBar -Name 'Valid' -Value $Script:Reporting['GPOList']['Variables']['GPOValid'], $Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked']
-                    New-ChartBar -Name 'With problem (computers)' -Value $Script:Reporting['GPOList']['Variables']['ComputerProblemNo'], $Script:Reporting['GPOList']['Variables']['ComputerProblemYes']
-                    New-ChartBar -Name 'With problem (users)' -Value $Script:Reporting['GPOList']['Variables']['UserProblemNo'], $Script:Reporting['GPOList']['Variables']['UserProblemYes']
+                    New-ChartBar -Name 'Not Empty' -Value $Script:Reporting['GPOList']['Variables']['GPONotEmpty'], $Script:Reporting['GPOList']['Variables']['GPOEmpty']
+                    New-ChartBar -Name 'Enabled' -Value $Script:Reporting['GPOList']['Variables']['GPOEnabled'], $Script:Reporting['GPOList']['Variables']['GPODisabled']
+                    New-ChartBar -Name 'Valid' -Value $Script:Reporting['GPOList']['Variables']['GPOValid'], $Script:Reporting['GPOList']['Variables']['GPONotValid']
+                    New-ChartBar -Name 'Optimized (for speed)' -Value $Script:Reporting['GPOList']['Variables']['GPOOptimized'], $Script:Reporting['GPOList']['Variables']['GPONotOptimized']
+                    New-ChartBar -Name 'No problem' -Value $Script:Reporting['GPOList']['Variables']['GPONoProblem'], $Script:Reporting['GPOList']['Variables']['GPOProblem']
+                    New-ChartBar -Name 'No problem (computers)' -Value $Script:Reporting['GPOList']['Variables']['ComputerProblemNo'], $Script:Reporting['GPOList']['Variables']['ComputerProblemYes']
+                    New-ChartBar -Name 'No problem (users)' -Value $Script:Reporting['GPOList']['Variables']['UserProblemNo'], $Script:Reporting['GPOList']['Variables']['UserProblemYes']
                     New-ChartBar -Name 'Optimized Computers' -Value $Script:Reporting['GPOList']['Variables']['ComputerOptimizedYes'], $Script:Reporting['GPOList']['Variables']['ComputerOptimizedNo']
                     New-ChartBar -Name 'Optimized Users' -Value $Script:Reporting['GPOList']['Variables']['UserOptimizedYes'], $Script:Reporting['GPOList']['Variables']['UserOptimizedNo']
                 } -TitleAlignment center
             }
         }
         New-HTMLSection -Name 'Group Policies List' {
-            New-HTMLTable -DataTable $Script:Reporting['GPOList']['Data'] -Filtering {
-                New-HTMLTableCondition -Name 'Empty' -Value $true -BackgroundColor Salmon -ComparisonType string
-                New-HTMLTableCondition -Name 'Linked' -Value $false -BackgroundColor Salmon -ComparisonType string
-                New-HTMLTableCondition -Name 'ComputerProblem' -Value $true -BackgroundColor Salmon -ComparisonType string
-                New-HTMLTableCondition -Name 'UserProblem' -Value $true -BackgroundColor Salmon -ComparisonType string
-                New-HTMLTableCondition -Name 'ComputerOptimized' -Value $false -BackgroundColor Salmon -ComparisonType string
-                New-HTMLTableCondition -Name 'UserOptimized' -Value $false -BackgroundColor Salmon -TextTransform capitalize -ComparisonType string
-                # reverse
-                New-HTMLTableCondition -Name 'Empty' -Value $false -BackgroundColor SpringGreen -ComparisonType string
-                New-HTMLTableCondition -Name 'Linked' -Value $true -BackgroundColor SpringGreen -ComparisonType string
-                New-HTMLTableCondition -Name 'ComputerProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
-                New-HTMLTableCondition -Name 'UserProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
-                New-HTMLTableCondition -Name 'ComputerOptimized' -Value $true -BackgroundColor SpringGreen -ComparisonType string
-                New-HTMLTableCondition -Name 'UserOptimized' -Value $true -BackgroundColor SpringGreen -TextTransform capitalize -ComparisonType string
-            } -PagingOptions 10, 20, 30, 40, 50
-        }
-        if ($Script:Reporting['GPOList']['WarningsAndErrors']) {
-            New-HTMLSection -Name 'Warnings & Errors to Review' {
-                New-HTMLTable -DataTable $Script:Reporting['GPOList']['WarningsAndErrors'] -Filtering {
-                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
-                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
-                }
+            New-HTMLContainer {
+                New-HTMLText -Text 'Explanation to table columns:' -FontSize 10pt
+                New-HTMLList {
+                    New-HTMLListItem -FontWeight bold, normal -Text "Empty", " - means GPO has currently no content. It could be there was content, but it was removed, or that it never had content. "
+                    New-HTMLListItem -FontWeight bold, normal -Text "Linked", " - means GPO is linked or unlinked. We need at least one link that is enabled to mark it as linked. If GPO is linked, but all links are disabled, it's not linked. "
+                    New-HTMLListItem -FontWeight bold, normal -Text "Enabled", " - means GPO has at least one section enabled. If enabled is set to false that means both sections are disabled, and therefore GPO is not active. "
+                    New-HTMLListItem -FontWeight bold, normal -Text "Optimized", " - means GPO section that is not in use is disabled. If section (user or computer) is enabled and there is no content, it's not optimized. "
+                    New-HTMLListItem -FontWeight bold, normal -Text "Problem", " - means GPO has one or more section (user or computer) that is disabled, yet there is content in it. "
+                } -FontSize 10pt
+                New-HTMLTable -DataTable $Script:Reporting['GPOList']['Data'] -Filtering {
+                    New-HTMLTableCondition -Name 'Empty' -Value $true -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'Linked' -Value $false -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'Enabled' -Value $false -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'Optimized' -Value $false -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'Problem' -Value $true -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'ComputerProblem' -Value $true -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'UserProblem' -Value $true -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'ComputerOptimized' -Value $false -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'UserOptimized' -Value $false -BackgroundColor Salmon -TextTransform capitalize -ComparisonType string
+                    # reverse
+                    New-HTMLTableCondition -Name 'Empty' -Value $false -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'Linked' -Value $true -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'Enabled' -Value $true -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'Optimized' -Value $true -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'Problem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'ComputerProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'UserProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'ComputerOptimized' -Value $true -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'UserOptimized' -Value $true -BackgroundColor SpringGreen -TextTransform capitalize -ComparisonType string
+                } -PagingOptions 10, 20, 30, 40, 50
             }
         }
-        New-HTMLSection -Name 'Steps to fix - Empty & Unlinked Group Policies' {
+        New-HTMLSection -Name 'Steps to fix - Empty & Unlinked & Disabled Group Policies' {
             New-HTMLContainer {
                 New-HTMLSpanStyle -FontSize 10pt {
                     New-HTMLText -Text 'Following steps will guide you how to remove empty or unlinked group policies'
@@ -241,6 +277,21 @@
                             }
                             New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
                         }
+                        New-HTMLWizardStep -Name 'Make a backup' {
+                            New-HTMLText -TextBlock {
+                                "The process of deleting Group Policies is final. Once GPO is removed - it's gone. "
+                                "To make sure you can recover deleted GPO please make sure to back them up. "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                $GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All
+                                $GPOSummary | Format-Table # only if you want to display output of backup
+                            }
+                            New-HTMLText -TextBlock {
+                                "Above command when executed will make a backup to Desktop, create GPO folder and within it it will put all those GPOs. "
+                                "Keep in mind that Remove-GPOZaurr command also has a backup feature built-in. "
+                                "It's possible to skip this backup and use the backup provided as part of Remove-GPOZaurr command. "
+                            }
+                        }
                         New-HTMLWizardStep -Name 'Remove GPOs that are EMPTY or UNLINKED' {
                             New-HTMLText -Text @(
                                 "Following command when executed removes every ",
@@ -251,23 +302,79 @@
                                 "WhatIf",
                                 " parameter as shown below to prevent accidental removal.",
                                 "Make sure to use BackupPath which will make sure that for each GPO that is about to be deleted a backup is made to folder on a desktop."
+                                "You can skip parameters related to backup if you did backup all GPOs prior to running remove command. "
                             ) -FontWeight normal, bold, normal, bold, normal, bold, normal, normal -Color Black, Red, Black, Red, Black
                             New-HTMLCodeBlock -Code {
                                 Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf
                             }
                             New-HTMLText -TextBlock {
-                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be deleted matches expected data. Once happy with results please follow with command: "
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
                             }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be deleted matches expected data. "
+                            } -LineBreak
+                            New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
                             New-HTMLCodeBlock -Code {
                                 Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose
                             }
                             New-HTMLText -TextBlock {
-                                "This command when executed deletes only first empty or unlinked GPOs. Use LimitProcessing parameter to prevent mass delete and increase the counter when no errors occur."
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "This command when executed deletes only first X empty or unlinked GPOs. Use LimitProcessing parameter to prevent mass delete and increase the counter when no errors occur."
                                 "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
                                 "Please make sure to check if backup is made as well before going all in."
                             }
                             New-HTMLText -Text "If there's nothing else to be deleted on SYSVOL side, we can skip to next step step"
                         }
+                        New-HTMLWizardStep -Name 'Remove GPOs that are DISABLED' {
+                            New-HTMLText -Text @(
+                                "Following command when executed removes every ",
+                                "DISABLED"
+                                " Group Policy. Make sure when running it for the first time to run it with ",
+                                "WhatIf",
+                                " parameter as shown below to prevent accidental removal.",
+                                "Make sure to use BackupPath which will make sure that for each GPO that is about to be deleted a backup is made to folder on a desktop."
+                                "You can skip parameters related to backup if you did backup all GPOs prior to running remove command. "
+                            ) -FontWeight normal, bold, normal, bold, normal, bold, normal, normal -Color Black, Red, Black, Red, Black
+                            New-HTMLText -TextBlock {
+                                ""
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurr -Type Disabled -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurr -Type Disabled -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be deleted matches expected data. "
+                            } -LineBreak
+                            New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurr -Type Disabled -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurr -Type Disabled -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "This command when executed deletes only first X disabled GPOs. Use LimitProcessing parameter to prevent mass delete and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly. "
+                                "Please make sure to check if backup is made as well before going all in."
+                            }
+                            New-HTMLText -Text "If there's nothing else to be deleted, we can skip to next step step."
+                        }
                         New-HTMLWizardStep -Name 'Verification report' {
                             New-HTMLText -TextBlock {
                                 "Once cleanup task was executed properly, we need to verify that report now shows no problems."
@@ -281,5 +388,13 @@
                 }
             }
         }
+        if ($Script:Reporting['GPOList']['WarningsAndErrors']) {
+            New-HTMLSection -Name 'Warnings & Errors to Review' {
+                New-HTMLTable -DataTable $Script:Reporting['GPOList']['WarningsAndErrors'] -Filtering {
+                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
+                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
+                }
+            }
+        }
     }
 }

Private/Invoke.GPOZaurrNetLogonOwners.ps1

@@ -183,8 +183,8 @@
                             } -LineBreak
                             New-HTMLText -Text "Once happy with results please follow with command (this will start replacement of owners process): " -LineBreak -FontWeight bold
                             New-HTMLText -TextBlock {
-                                "This command when executed sets new owner only on first X non-compliant NetLogon files. Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur."
-                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
+                                "This command when executed sets new owner only on first X non-compliant NetLogon files. Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly. "
                             }
                             New-HTMLCodeBlock -Code {
                                 Repair-GPOZaurrNetLogonOwner -Verbose -LimitProcessing 2

Private/Invoke.GPOZaurrNetLogonPermissions.ps1

@@ -257,8 +257,8 @@
                                 Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrNetLogonBefore.html -Verbose -Type NetLogonPermissions
                             }
                             New-HTMLText -TextBlock {
-                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment."
-                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step."
+                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment. "
+                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step. "
                             }
                             New-HTMLText -Text "Alternatively if you prefer working with console you can run: "
                             New-HTMLCodeBlock -Code {

Private/Invoke.GPOZaurrOwners.ps1

@@ -203,8 +203,8 @@
                                 Set-GPOZaurrOwner -Type All -Verbose -LimitProcessing 2 -IncludeDomains 'YourDomainYouHavePermissionsFor'
                             }
                             New-HTMLText -TextBlock {
-                                "This command when executed sets new owner only on first X non-compliant GPO Owners for AD/SYSVOL. Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur."
-                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
+                                "This command when executed sets new owner only on first X non-compliant GPO Owners for AD/SYSVOL. Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly. "
                             }
                         }
                         New-HTMLWizardStep -Name 'Verification report' {

Private/Invoke.GPOZaurrPermissionsAdministrative.ps1

@@ -0,0 +1,199 @@
+$GPOZaurrPermissionsAdministrative = [ordered] @{
+    Name       = 'Group Policy Administrative Permissions'
+    Enabled    = $true
+    Action     = $null
+    Data       = $null
+    Execute    = {
+        $Object = [ordered] @{
+            Permissions = Get-GPOZaurrPermission -Type Administrative -IncludePermissionType GpoEditDeleteModifySecurity -ReturnSecurityWhenNoData -IncludeGPOObject -ReturnSingleObject -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains
+        }
+        $Object['PermissionsPerRow'] = $Object['Permissions'] | ForEach-Object { $_ }
+        $Object
+    }
+    Processing = {
+        # Create Per Domain Variables
+        $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFixPerDomain'] = @{}
+        $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouchPerDomain'] = @{}
+
+        foreach ($GPO in $Script:Reporting['GPOPermissionsAdministrative']['Data'].Permissions) {
+            # Create Per Domain Variables
+            if (-not $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFixPerDomain'][$GPO[0].DomainName]) {
+                $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFixPerDomain'][$GPO[0].DomainName] = 0
+            }
+            if (-not $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouchPerDomain'][$GPO[0].DomainName]) {
+                $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouchPerDomain'][$GPO[0].DomainName] = 0
+            }
+            # Checks
+
+            $Analysis = Get-PermissionsAnalysis -GPOPermissions $GPO -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -Type Administrative -PermissionType GpoEditDeleteModifySecurity
+            if ($Analysis.Skip) {
+                $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouch']++
+                $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouchPerDomain'][$GPO[0].DomainName]++
+            } else {
+                $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFix']++
+                $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFixPerDomain'][$GPO[0].DomainName]++
+            }
+        }
+        if ($Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFix'] -gt 0) {
+            $Script:Reporting['GPOPermissionsAdministrative']['ActionRequired'] = $true
+        } else {
+            $Script:Reporting['GPOPermissionsAdministrative']['ActionRequired'] = $false
+        }
+    }
+    Variables  = @{
+        WillFix               = 0
+        WillNotTouch          = 0
+        WillFixPerDomain      = $null
+        WillNotTouchPerDomain = $null
+    }
+    Overview   = {
+
+    }
+    Summary    = {
+        New-HTMLText -FontSize 10pt -TextBlock {
+            "When GPO is created by default it gets Domain Admins and Enterprise Admins with Edit/Delete/Modify Security permissions. "
+            "For some reason, some Administrators remove those permissions or modify them when they shouldn't touch those at all. "
+            "Since having Edit/Delete/Modify Security permissions doesn't affect GPOApply permissions there's no reason to remove Domain Admins or Enterprise Admins from permissions, or limit their rights. "
+        } -LineBreak
+        New-HTMLText -FontSize 10pt -Text "Assesment results: " -FontWeight bold
+        New-HTMLList -Type Unordered {
+            New-HTMLListItem -Text 'Group Policies requiring adding Domain Admins or Enterprise Admins: ', $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFix'] -FontWeight normal, bold
+            New-HTMLListItem -Text "Group Policies which don't require changes: ", $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouch'] -FontWeight normal, bold
+        } -FontSize 10pt
+        New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
+        New-HTMLList -Type Unordered {
+            foreach ($Domain in $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFixPerDomain'].Keys) {
+                New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFixPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
+            }
+        } -FontSize 10pt
+        New-HTMLText -Text @(
+            "That means we need to fix permissions on: "
+            $($Script:Reporting['GPOPermissionsAdministrative']['Variables'].WillFix)
+            " out of "
+            $($Script:Reporting['GPOPermissionsAdministrative']['Data'].Permissions).Count
+            " Group Policies. "
+        ) -FontSize 10pt -FontWeight bold, bold, normal, bold, normal -Color Black, FreeSpeechRed, Black, Black -LineBreak -TextDecoration none, underline, underline, underline, none
+    }
+    Solution   = {
+        New-HTMLSection -Invisible {
+            New-HTMLPanel {
+                & $Script:GPOConfiguration['GPOPermissionsAdministrative']['Summary']
+            }
+            New-HTMLPanel {
+                New-HTMLChart {
+                    New-ChartBarOptions -Type barStacked
+                    New-ChartLegend -Name 'Yes', 'No' -Color LightGreen, Salmon
+                    New-ChartBar -Name 'Administrative Users Present' -Value $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouch'], $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFix']
+                    #New-ChartBar -Name 'Accessible Group Policies' -Value $Script:Reporting['GPOPermissionsAdministrative']['Variables']['Read'], $Script:Reporting['GPOPermissionsAdministrative']['Variables']['CouldNotRead']
+                } -Title 'Group Policy Permissions' -TitleAlignment center
+            }
+        }
+        New-HTMLSection -Name 'Group Policy Administrative Users Analysis' {
+            New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsAdministrative']['Data'].PermissionsPerRow -Filtering {
+                New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row
+            } -PagingOptions 7, 15, 30, 45, 60
+        }
+        New-HTMLSection -Name 'Steps to fix Group Policy Administrative Users' {
+            New-HTMLContainer {
+                New-HTMLSpanStyle -FontSize 10pt {
+                    New-HTMLWizard {
+                        New-HTMLWizardStep -Name 'Prepare environment' {
+                            New-HTMLText -Text "To be able to execute actions in automated way please install required modules. Those modules will be installed straight from Microsoft PowerShell Gallery."
+                            New-HTMLCodeBlock -Code {
+                                Install-Module GPOZaurr -Force
+                                Import-Module GPOZaurr -Force
+                            } -Style powershell
+                            New-HTMLText -Text "Using force makes sure newest version is downloaded from PowerShellGallery regardless of what is currently installed. Once installed you're ready for next step."
+                        }
+                        New-HTMLWizardStep -Name 'Prepare report' {
+                            New-HTMLText -Text "Depending when this report was run you may want to prepare new report before proceeding with fixing Group Policy Authenticated Users. To generate new report please use:"
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPermissionsAdministrativeBefore.html -Verbose -Type GPOPermissionsAdministrative
+                            }
+                            New-HTMLText -TextBlock {
+                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment. "
+                                "GPOs with problems will be those not having any value for Permission/PermissionType columns. "
+                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step."
+                            }
+                            New-HTMLText -Text "Alternatively if you prefer working with console you can run: "
+                            New-HTMLCodeBlock -Code {
+                                $AdministrativeUsers = Get-GPOZaurrPermission -Type Administrative -IncludePermissionType GpoEditDeleteModifySecurity -ReturnSecurityWhenNoData
+                                $AdministrativeUsers | Format-Table
+                            }
+                            New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
+                        }
+                        New-HTMLWizardStep -Name 'Make a backup (optional)' {
+                            New-HTMLText -TextBlock {
+                                "The process of fixing GPO Permissions does NOT touch GPO content. It simply adds permissionss on AD and SYSVOL at the same time for given GPO. "
+                                "However, it's always good to have a backup before executing changes that may impact Active Directory. "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                $GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All
+                                $GPOSummary | Format-Table # only if you want to display output of backup
+                            }
+                            New-HTMLText -TextBlock {
+                                "Above command when executed will make a backup to Desktop, create GPO folder and within it it will put all those GPOs. "
+                            }
+                        }
+
+                        New-HTMLWizardStep -Name 'Add Administrative Groups proper permissions GPO' {
+                            New-HTMLText -Text @(
+                                "Following command will find any GPO which doesn't have Domain Admins and Enterprise Admins added with GpoEditDeleteModifySecurity and will add it as GpoEditDeleteModifySecurity. ",
+                                "This change doesn't change GpoApply permission, therefore it won't change to whom the GPO applies to. ",
+                                "It ensures that Domain Admins and Enterprise Admins can manage GPO. ",
+                                "Make sure when running it for the first time to run it with ",
+                                "WhatIf",
+                                " parameter as shown below to prevent accidental adding of permissions."
+                            ) -FontWeight normal, normal, normal, normal, bold, normal -Color Black, Black, Black, Black, Red, Black
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type Administrative -PermissionType GpoEditDeleteModifySecurity -All -WhatIf -Verbose
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type Administrative -PermissionType GpoEditDeleteModifySecurity -All -WhatIf -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be changed matches expected data."
+                            } -LineBreak
+                            New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type Administrative -PermissionType GpoEditDeleteModifySecurity -All -Verbose -LimitProcessing 2
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type Administrative -PermissionType GpoEditDeleteModifySecurity -All -Verbose -LimitProcessing 2 -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "This command when executed adds Enterprise Admins or/and Domain Admins (GpoEditDeleteModifySecurity permission) only on first X non-compliant Group Policies. "
+                                "Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. "
+                                "In case of any issues please review and action accordingly. "
+                            }
+                        }
+                        New-HTMLWizardStep -Name 'Verification report' {
+                            New-HTMLText -TextBlock {
+                                "Once cleanup task was executed properly, we need to verify that report now shows no problems."
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPermissionsAdministrativeAfter.html -Verbose -Type GPOPermissionsAdministrative
+                            }
+                            New-HTMLText -Text "If everything is healthy in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
+                        }
+                    } -RemoveDoneStepOnNavigateBack -Theme arrows -ToolbarButtonPosition center
+                }
+            }
+        }
+        if ($Script:Reporting['GPOPermissionsAdministrative']['WarningsAndErrors']) {
+            New-HTMLSection -Name 'Warnings & Errors to Review' {
+                New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsAdministrative']['WarningsAndErrors'] -Filtering {
+                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
+                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
+                } -PagingOptions 10, 20, 30, 40, 50
+            }
+        }
+    }
+}

Private/Invoke.GPOZaurrPermissionsRead.ps1

@@ -234,7 +234,7 @@
                             }
                             New-HTMLText -TextBlock {
                                 "This command when executed adds Authenticated Users (GpoRead permission) only on first X non-compliant Group Policies. "
-                                "Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur."
+                                "Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur. "
                                 "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. "
                                 "In case of any issues please review and action accordingly."
                             }

Private/Invoke.GPOZaurrPermissionsUnknown.ps1

@@ -0,0 +1,179 @@
+$GPOZaurrPermissionsUnknown = [ordered] @{
+    Name       = 'Group Policy Unknown Permissions'
+    Enabled    = $true
+    Action     = $null
+    Data       = $null
+    Execute    = {
+        Get-GPOZaurrPermission -Type Unknown -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains
+    }
+    Processing = {
+        # Create Per Domain Variables
+        $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFixPerDomain'] = @{}
+        foreach ($GPO in $Script:Reporting['GPOPermissionsUnknown']['Data']) {
+            # Create Per Domain Variables
+            if (-not $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFixPerDomain'][$GPO[0].DomainName]) {
+                $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFixPerDomain'][$GPO[0].DomainName] = 0
+            }
+            # Checks
+            $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFix']++
+            $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFixPerDomain'][$GPO[0].DomainName]++
+        }
+        if ($Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFix'] -gt 0) {
+            $Script:Reporting['GPOPermissionsUnknown']['ActionRequired'] = $true
+        } else {
+            $Script:Reporting['GPOPermissionsUnknown']['ActionRequired'] = $false
+        }
+    }
+    Variables  = @{
+        WillFix          = 0
+        WillFixPerDomain = $null
+    }
+    Overview   = {
+
+    }
+    Summary    = {
+        New-HTMLText -FontSize 10pt -TextBlock {
+            "Group Policies contain multiple permissions for different level of access. "
+            "Be it adminstrative permissions, read permissions or apply permissions. "
+            "Over time some users or groups get deleted for different reasons and such permission in Group Policies leave a trace in form of Unknown SID. "
+            "Unknown SIDs can also be remains of Active Directory Trusts, that have been deleted or are otherwise unavailable. "
+            "Following assesment detects all unknown permissions and provides them for review & deletion. "
+        } -LineBreak
+        New-HTMLText -FontSize 10pt -Text "Assesment results: " -FontWeight bold
+        New-HTMLList -Type Unordered {
+            New-HTMLListItem -Text 'Group Policies requiring removal of unknown SIDs: ', $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFix'] -FontWeight normal, bold
+        } -FontSize 10pt
+        New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
+        New-HTMLList -Type Unordered {
+            foreach ($Domain in $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFixPerDomain'].Keys) {
+                New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFixPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
+            }
+        } -FontSize 10pt
+        New-HTMLText -Text @(
+            "That means we need to remove "
+            $($Script:Reporting['GPOPermissionsUnknown']['Variables'].WillFix)
+            " unknown permissions from Group Policies. "
+        ) -FontSize 10pt -FontWeight normal, bold, normal -Color Black, FreeSpeechRed, Black -LineBreak -TextDecoration none, underline, none
+    }
+    Solution   = {
+        New-HTMLSection -Invisible {
+            New-HTMLPanel {
+                & $Script:GPOConfiguration['GPOPermissionsUnknown']['Summary']
+            }
+            New-HTMLPanel {
+                New-HTMLChart {
+                    New-ChartBarOptions -Type barStacked
+                    New-ChartLegend -Name 'Yes' -Color Salmon
+                    New-ChartBar -Name 'Unknown Permissions Present' -Value $Script:Reporting['GPOPermissionsUnknown']['Variables']['WillFix']
+                } -Title 'Group Policy Permissions' -TitleAlignment center
+            }
+        }
+        New-HTMLSection -Name 'Group Policy Unknown Permissions Analysis' {
+            New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsUnknown']['Data'] -Filtering {
+                New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row
+            } -PagingOptions 7, 15, 30, 45, 60
+        }
+        New-HTMLSection -Name 'Steps to fix Group Policy Unknown Permissions' {
+            New-HTMLContainer {
+                New-HTMLSpanStyle -FontSize 10pt {
+                    New-HTMLWizard {
+                        New-HTMLWizardStep -Name 'Prepare environment' {
+                            New-HTMLText -Text "To be able to execute actions in automated way please install required modules. Those modules will be installed straight from Microsoft PowerShell Gallery."
+                            New-HTMLCodeBlock -Code {
+                                Install-Module GPOZaurr -Force
+                                Import-Module GPOZaurr -Force
+                            } -Style powershell
+                            New-HTMLText -Text "Using force makes sure newest version is downloaded from PowerShellGallery regardless of what is currently installed. Once installed you're ready for next step."
+                        }
+                        New-HTMLWizardStep -Name 'Prepare report' {
+                            New-HTMLText -Text "Depending when this report was run you may want to prepare new report before proceeding with removing unknown permissions. To generate new report please use:"
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPermissionsUnknownBefore.html -Verbose -Type GPOPermissionsUnknown
+                            }
+                            New-HTMLText -TextBlock {
+                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment. "
+                                "The table only shows GPO and their unknown permissions. "
+                                "It doesn't show permissions that are not subject of this investigation. "
+                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step."
+                            }
+                            New-HTMLText -Text "Alternatively if you prefer working with console you can run: "
+                            New-HTMLCodeBlock -Code {
+                                $UnknownPermissions = Get-GPOZaurrPermission -Type Unknown
+                                $UnknownPermissions | Format-Table
+                            }
+                            New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
+                        }
+                        New-HTMLWizardStep -Name 'Make a backup (optional)' {
+                            New-HTMLText -TextBlock {
+                                "The process of fixing GPO Permissions does NOT touch GPO content. It simply removes permissionss on AD and SYSVOL at the same time for given GPO. "
+                                "However, it's always good to have a backup before executing changes that may impact Active Directory. "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                $GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All
+                                $GPOSummary | Format-Table # only if you want to display output of backup
+                            }
+                            New-HTMLText -TextBlock {
+                                "Above command when executed will make a backup to Desktop, create GPO folder and within it it will put all those GPOs. "
+                            }
+                        }
+                        New-HTMLWizardStep -Name 'Remove Unknown Permissions' {
+                            New-HTMLText -Text @(
+                                "Following command will find any GPO which has an unknown SID and will remove it. ",
+                                "This change doesn't change any other permissions. ",
+                                "It ensures that GPOs have no unknown permissions present. ",
+                                "Make sure when running it for the first time to run it with ",
+                                "WhatIf",
+                                " parameter as shown below to prevent accidental adding of permissions."
+                            ) -FontWeight normal, normal, normal, normal, bold, normal -Color Black, Black, Black, Black, Red, Black
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurrPermission -Verbose -Type Unknown -WhatIf
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurrPermission -Verbose -Type Unknown -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be changed matches expected data."
+                            } -LineBreak
+                            New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurrPermission -Verbose -Type Unknown -LimitProcessing 2
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Remove-GPOZaurrPermission -Verbose -Type Unknown -LimitProcessing 2 -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "This command when executed removes only first X unknwon permissions from Group Policies. "
+                                "Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur. "
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. "
+                                "In case of any issues please review and action accordingly. "
+                            }
+                        }
+                        New-HTMLWizardStep -Name 'Verification report' {
+                            New-HTMLText -TextBlock {
+                                "Once cleanup task was executed properly, we need to verify that report now shows no problems."
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPermissionsUnknownAfter.html -Verbose -Type GPOPermissionsUnknown
+                            }
+                            New-HTMLText -Text "If everything is healthy in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
+                        }
+                    } -RemoveDoneStepOnNavigateBack -Theme arrows -ToolbarButtonPosition center
+                }
+            }
+        }
+        if ($Script:Reporting['GPOPermissionsUnknown']['WarningsAndErrors']) {
+            New-HTMLSection -Name 'Warnings & Errors to Review' {
+                New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsUnknown']['WarningsAndErrors'] -Filtering {
+                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
+                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
+                } -PagingOptions 10, 20, 30, 40, 50
+            }
+        }
+    }
+}

Private/New-GPOZaurrReportHTML.ps1

@@ -6,6 +6,11 @@ function New-GPOZaurrReportHTML {
         [switch] $Offline,
         [switch] $Open
     )
+
+
+
+
+
     $PSDefaultParameterValues = @{
         "New-HTMLTable:WarningAction" = 'SilentlyContinue'
     }
@@ -17,14 +22,47 @@ function New-GPOZaurrReportHTML {
     #$LoggingMode = $($Support.ResultantSetPolicy.LoggingMode)
     New-HTML -TitleText "Group Policy Report - $ComputerName" {
         #New-HTMLTabOptions -SlimTabs -Transition -LinearGradient -SelectorColor Akaroa
+        New-HTMLTableOption -DataStore JavaScript -BoolAsString
         New-HTMLTabOptions -SlimTabs `
             -BorderBottomStyleActive solid -BorderBottomColorActive LightSkyBlue -BackgroundColorActive none `
             -TextColorActive Black -Align left -BorderRadius 0px -RemoveShadow -TextColor Grey -TextTransform capitalize
         New-HTMLTab -Name 'Information' {
-            New-HTMLTable -DataTable $Support.ResultantSetPolicy -HideFooter
+            New-HTMLTable -DataTable $Support.ResultantSetPolicy -HideFooter -Transpose
+
+            New-HTMLSection {
+                New-HTMLSection {
+                    New-HTMLTable -DataTable $Support.ComputerInformation.Time -Filtering -Transpose {
+                        New-TableHeader -Names 'Name', 'Value' -Title 'Time Information'
+                    }
+                    New-HTMLTable -DataTable $Support.ComputerInformation.BIOS -Filtering -Transpose
+                }
+                New-HTMLContainer {
+                    New-HTMLSection {
+                        New-HTMLTable -DataTable $Support.ComputerInformation.CPU -Filtering
+                    }
+                    New-HTMLSection {
+                        New-HTMLTable -DataTable $Support.ComputerInformation.RAM -Filtering
+                    }
+                }
+
+            }
+            New-HTMLSection {
+                New-HTMLTable -DataTable $Support.ComputerInformation.OperatingSystem -Filtering
+                New-HTMLTable -DataTable $Support.ComputerInformation.System -Filtering
+            }
+            New-HTMLSection {
+                New-HTMLTable -DataTable $Support.ComputerInformation.Disk -Filtering
+                New-HTMLTable -DataTable $Support.ComputerInformation.DiskLogical -Filtering
+            }
+            New-HTMLSection {
+                New-HTMLTable -DataTable $Support.ComputerInformation.Services -Filtering
+            }
+            New-HTMLSection {
+
+            }
         }
         foreach ($Key in $Support.Keys) {
-            if ($Key -eq 'ResultantSetPolicy') {
+            if ($Key -in 'ResultantSetPolicy', 'ComputerInformation') {
                 continue
             }
             New-HTMLTab -Name $Key {
@@ -32,7 +70,7 @@ function New-GPOZaurrReportHTML {
                     New-HTMLSection -Invisible {
                         New-HTMLSection -HeaderText 'Summary' {
                             New-HTMLTable -DataTable $Support.$Key.Summary -Filtering -PagingOptions @(7, 14 )
-                            New-HTMLTable -DataTable $Support.$Key.SummaryDetails -Filtering -PagingOptions @(7, 14)
+                            New-HTMLTable -DataTable $Support.$Key.SummaryDetails -Filtering -PagingOptions @(7, 14) -Transpose
                         }
                         New-HTMLSection -HeaderText 'Part of Security Groups' {
                             New-HTMLTable -DataTable $Support.$Key.SecurityGroups -Filtering -PagingOptions @(7, 14)
@@ -55,11 +93,34 @@ function New-GPOZaurrReportHTML {
                         }
                         #>
                         New-HTMLSection -HeaderText 'ExtensionStatus' {
-                            New-HTMLTable -DataTable $Support.$Key.ExtensionStatus -Filtering
+                            New-HTMLPanel {
+                                New-HTMLTable -DataTable $Support.$Key.ExtensionStatus -Filtering
+                            }
+                            New-HTMLPanel {
+                                New-HTMLChart -Title 'Extension TimeLine' -TitleAlignment center {
+                                    foreach ($Extension in $Support.$Key.ExtensionStatus) {
+                                        New-ChartTimeLine -DateFrom ([DateTime] $Extension.BeginTime) -DateTo ([DateTime] $Extension.EndTime) -Name $Extension.Name
+                                    }
+                                }
+                            }
                         }
                     }
                     New-HTMLSection -HeaderText 'Group Policies' {
-                        New-HTMLTable -DataTable $Support.$Key.GroupPolicies -Filtering
+                        New-HTMLTable -DataTable $Support.$Key.GroupPolicies -Filtering {
+                            # Global color applied
+                            New-TableCondition -Name 'Status' -Value 'Applied' -BackgroundColor BrightGreen -Row
+                            New-TableCondition -Name 'Status' -Value 'Denied' -BackgroundColor Salmon -Row
+
+                            # One by one colors
+                            New-TableCondition -Name 'IsValid' -Value $true -BackgroundColor BrightGreen
+                            New-TableCondition -Name 'IsValid' -Value $false -BackgroundColor Salmon
+
+                            New-TableCondition -Name 'FilterAllowed' -Value $true -BackgroundColor BrightGreen
+                            New-TableCondition -Name 'FilterAllowed' -Value $false -BackgroundColor Salmon
+
+                            New-TableCondition -Name 'AccessAllowed' -Value $true -BackgroundColor BrightGreen
+                            New-TableCondition -Name 'AccessAllowed' -Value $false -BackgroundColor Salmon
+                        }
                     }
                     New-HTMLSection -HeaderText 'Group Policies Links' {
                         New-HTMLTable -DataTable $Support.$Key.GroupPoliciesLinks -Filtering

Private/Script.GPOConfiguration.ps1

@@ -1,17 +1,19 @@
 $Script:GPOConfiguration = [ordered] @{
-    GPOOrphans            = $GPOZaurrOrphans
-    GPOOwners             = $GPOZaurrOwners
-    GPOConsistency        = $GPOZaurrConsistency
-    GPODuplicates         = $GPOZaurrDuplicates
-    GPOList               = $GPOZaurrList
-    GPOPassword           = $GPOZaurrPassword
-    GPOPermissions        = $GPOZaurrPermissions
-    GPOPermissionsRead    = $GPOZaurrPermissionsRead
-    GPOPermissionsRoot    = $GPOZaurrPermissionsRoot
-    GPOFiles              = $GPOZaurrFiles
-    GPOBlockedInheritance = $GPOZaurrBlockedInheritance
-    GPOAnalysis           = $GPOZaurrAnalysis
-    NetLogonOwners        = $GPOZaurrNetLogonOwners
-    NetLogonPermissions   = $GPOZaurrNetLogonPermissions
-    SysVolLegacyFiles     = $GPOZaurrSysVolLegacyFiles
+    GPOOrphans                   = $GPOZaurrOrphans
+    GPOOwners                    = $GPOZaurrOwners
+    GPOConsistency               = $GPOZaurrConsistency
+    GPODuplicates                = $GPOZaurrDuplicates
+    GPOList                      = $GPOZaurrList
+    GPOPassword                  = $GPOZaurrPassword
+    GPOPermissions               = $GPOZaurrPermissions
+    GPOPermissionsAdministrative = $GPOZaurrPermissionsAdministrative
+    GPOPermissionsRead           = $GPOZaurrPermissionsRead
+    GPOPermissionsRoot           = $GPOZaurrPermissionsRoot
+    GPOPermissionsUnknown        = $GPOZaurrPermissionsUnknown
+    GPOFiles                     = $GPOZaurrFiles
+    GPOBlockedInheritance        = $GPOZaurrBlockedInheritance
+    GPOAnalysis                  = $GPOZaurrAnalysis
+    NetLogonOwners               = $GPOZaurrNetLogonOwners
+    NetLogonPermissions          = $GPOZaurrNetLogonPermissions
+    SysVolLegacyFiles            = $GPOZaurrSysVolLegacyFiles
 }

Private/Test-SysvolFolders.ps1

@@ -96,7 +96,7 @@
             }
         }
         # Now we need to list thru Sysvol files and fine those that do not exists as GPO and create dummy GPO objects to show orphaned gpos
-        Write-Verbose "Get-GPOZaurrBroken - Processing SYSVOL differences and creating dummy objects"
+        Write-Verbose "Get-GPOZaurrBroken - Processing SYSVOL differences"
         foreach ($_ in $Differences.Keys) {
             if ($Differences[$_] -in 'Not available in AD', 'Permissions issue') {
                 $FullPath = $SysvolHash[$_].FullName

Public/Add-GPOZaurrPermission.ps1

@@ -23,7 +23,7 @@
         [alias('Domain', 'Domains')][string[]] $IncludeDomains,
         [System.Collections.IDictionary] $ExtendedForestInformation,
         [System.Collections.IDictionary] $ADAdministrativeGroups,
-        [int] $LimitProcessing
+        [int] $LimitProcessing = [int32]::MaxValue
     )
     $ForestInformation = Get-WinADForestDetails -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation -Extended
     if (-not $ADAdministrativeGroups) {
@@ -57,19 +57,20 @@
     $Splat['SkipWellKnown'] = $SkipWellKnown.IsPresent
     $Splat['SkipAdministrative'] = $SkipAdministrative.IsPresent
 
-    $AdministrativeExists = @{
-        DomainAdmins     = $false
-        EnterpriseAdmins = $false
-    }
     $CountFixed = 0
 
     Do {
         # This should always return results. When no data is found it should return basic information that will allow us to add credentials.
         Get-GPOZaurrPermission @Splat -ReturnSecurityWhenNoData -ReturnSingleObject | ForEach-Object {
+            $GPOPermissions = $_
+            $PermissionsAnalysis = Get-PermissionsAnalysis -GPOPermissions $GPOPermissions -ADAdministrativeGroups $ADAdministrativeGroups -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation -Type $Type -PermissionType $PermissionType
+            <#
             # Prepare data to clean
             $Skip = $false
-            $AdministrativeExists['EnterpriseAdmins'] = $false
-            $AdministrativeExists['DomainAdmins'] = $false
+            $AdministrativeExists = @{
+                DomainAdmins     = $false
+                EnterpriseAdmins = $false
+            }
             $GPOPermissions = $_
             # Verification Phase
             # When it has GPOSecurityPermissionItem property it means it has permissions, if it doesn't it means we have clean object to process
@@ -106,7 +107,8 @@
                     }
                 }
             }
-            if (-not $Skip) {
+            #>
+            if (-not $PermissionsAnalysis['Skip']) {
                 if (-not $GPOPermissions) {
                     # This is bad - things went wrong
                     Write-Warning "Add-GPOZaurrPermission - Couldn't get permissions for GPO. Things aren't what they should be. Skipping!"
@@ -116,7 +118,7 @@
                         # We asked, we got response, now we need to check if maybe we're missing one of the two administrative groups
                         if ($Type -eq 'Administrative') {
                             # this is a case where something was returned. Be it Domain Admins or Enterprise Admins or both. But we still need to check because it may have been Domain Admins from other domain or just one of the two required groups
-                            if ($AdministrativeExists['DomainAdmins'] -eq $false) {
+                            if ($PermissionsAnalysis['DomainAdmins'] -eq $false) {
                                 $Principal = $ADAdministrativeGroups[$GPO.DomainName]['DomainAdmins']
                                 Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
                                 $CountFixed++
@@ -130,7 +132,7 @@
                                     }
                                 }
                             }
-                            if ($AdministrativeExists['EnterpriseAdmins'] -eq $false) {
+                            if ($PermissionsAnalysis['EnterpriseAdmins'] -eq $false) {
                                 $Principal = $ADAdministrativeGroups[$ForestInformation.Forest.RootDomain]['EnterpriseAdmins']
                                 Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
                                 $CountFixed++

Public/Get-GPOZaurr.ps1

@@ -10,6 +10,8 @@
         [System.Collections.IDictionary] $ExtendedForestInformation,
         [string[]] $GPOPath,
 
+        [Array] $ExcludeGroupPolicies,
+
         [switch] $PermissionsOnly,
         [switch] $OwnerOnly,
         [switch] $Limited,
@@ -24,6 +26,22 @@
         if (-not $GPOPath) {
             $ForestInformation = Get-WinADForestDetails -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation
         }
+        $ExcludeGPO = [ordered] @{}
+        if ($ExcludeGroupPolicies) {
+            foreach ($GroupPolicy in $ExcludeGroupPolicies) {
+                if ($GroupPolicy -is [string]) {
+                    $ExcludeGPO[$GroupPolicy] = $true
+                } elseif ($GroupPolicy -is [System.Collections.IDictionary] -and $GroupPolicy.Name -and $GroupPolicy.DomainName) {
+                    $PolicyName = -join ($GroupPolicy.DomainName, $GroupPolicy.Name)
+                    $ExcludeGPO[$PolicyName] = $true
+                } elseif ($GroupPolicy -is [System.Collections.IDictionary] -and $GroupPolicy.Name) {
+                    $ExcludeGPO[$GroupPolicy.Name] = $true
+                } else {
+                    Write-Warning "Get-GPOZaurr - Exclusion takes only Group Policy Name as string, or as hashtable with domain name @{ Name = 'Group Policy Name'; DomainName = 'Domain' }."
+                    continue
+                }
+            }
+        }
     }
     Process {
         if (-not $GPOPath) {
@@ -43,7 +61,7 @@
                                 Write-Warning "Get-GPOZaurr - Failed to get GPOReport: $($_.Exception.Message). Skipping."
                                 continue
                             }
-                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent
+                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO
                         } else {
                             $_
                         }
@@ -61,7 +79,7 @@
                                 Write-Warning "Get-GPOZaurr - Failed to get GPOReport: $($_.Exception.Message). Skipping."
                                 continue
                             }
-                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent
+                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO
                         } else {
                             $_
                         }
@@ -79,7 +97,7 @@
                                 Write-Warning "Get-GPOZaurr - Failed to get GPOReport: $($_.Exception.Message). Skipping."
                                 continue
                             }
-                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent
+                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO
                         } else {
                             $_
                         }
@@ -92,7 +110,7 @@
                 Get-ChildItem -LiteralPath $Path -Recurse -Filter *.xml | ForEach-Object {
                     $XMLContent = [XML]::new()
                     $XMLContent.Load($_.FullName)
-                    Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -PermissionsOnly:$PermissionsOnly.IsPresent
+                    Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -PermissionsOnly:$PermissionsOnly.IsPresent -ExcludeGroupPolicies $ExcludeGPO
                 }
                 Write-Verbose "Get-GPOZaurr - Finished GPO content from XML files"
             }

Public/Get-GPOZaurrNetlogon.ps1

@@ -13,11 +13,14 @@
     $FilesAll = foreach ($Domain in $ForestInformation.Domains) {
         $Path = -join ("\\", $Domain, '\Netlogon')
         $PathOnSysvol = -join ("\\", $Domain, "\SYSVOL\", $Domain, "\Scripts")
-        $Files = Get-ChildItem -LiteralPath $Path -Recurse -Force -ErrorVariable Err -ErrorAction SilentlyContinue
+        [Array] $Files = Get-ChildItem -LiteralPath $Path -Recurse -Force -ErrorVariable Err -ErrorAction SilentlyContinue
         foreach ($e in $err) {
             Write-Warning "Get-GPOZaurrNetLogon - Listing file failed with error $($e.Exception.Message) ($($e.CategoryInfo.Reason))"
         }
+        $Count = 0
         foreach ($File in $Files) {
+            $Count++
+            Write-Verbose "GPOZaurrNetLogon - Processing [$($Domain)]($Count/$($Files.Count)) $($File.FullName)"
             try {
                 $ACL = Get-Acl -Path $File.FullName -ErrorAction Stop
             } catch {

Public/Invoke-GPOZaurr.ps1

@@ -2,6 +2,7 @@
     [alias('Show-GPOZaurr', 'Show-GPO')]
     [cmdletBinding()]
     param(
+        [scriptblock] $Extension,
         [string] $FilePath,
         [string[]] $Type,
         [switch] $PassThru,
@@ -41,6 +42,25 @@
     Write-Color '[i]', "[GPOZaurr] ", 'Domain Information', ' [Informative] ', "Included Domains: ", $DisplayIncludedDomains -Color Yellow, DarkGray, Yellow, DarkGray, Yellow, Magenta
     Write-Color '[i]', "[GPOZaurr] ", 'Domain Information', ' [Informative] ', "Excluded Domains: ", $DisplayExcludedDomains -Color Yellow, DarkGray, Yellow, DarkGray, Yellow, Magenta
 
+    # Exclusions support, converts ScriptBlock into list of GPOs
+    $Exclusions = [ordered]@{}
+    if ($Extension) {
+        $Exclusions['All'] = [System.Collections.Generic.List[PSCustomObject]]::new()
+        [Array] $ExecuteExtension = & $Extension
+        foreach ($Ext in $ExecuteExtension) {
+            if ($Ext.Type -eq 'Exclusion') {
+                if ($Ext.Type) {
+                    if (-not $Exclusions[$Ext.Type]) {
+                        $Exclusions[$Ext.Type] = [System.Collections.Generic.List[PSCustomObject]]::new()
+                    }
+                    $Exclusions[$Ext.Type].Add($Ext)
+                } else {
+                    $Exclusions['All'].Add($Ext)
+                }
+            }
+        }
+    }
+
     # Lets make sure we only enable those types which are requestd by user
     if ($Type) {
         foreach ($T in $Script:GPOConfiguration.Keys) {
@@ -59,14 +79,26 @@
                 Name              = $Script:GPOConfiguration[$T].Name
                 ActionRequired    = $null
                 Data              = $null
+                Exclusions        = $null
                 WarningsAndErrors = $null
                 Time              = $null
                 Summary           = $null
                 Variables         = Copy-Dictionary -Dictionary $Script:GPOConfiguration[$T]['Variables']
             }
+            if ($Exclusions) {
+                $Script:Reporting[$T]['Exclusions'] = $Extension
+            }
+
             $TimeLogGPOList = Start-TimeLog
             Write-Color -Text '[i]', '[Start] ', $($Script:GPOConfiguration[$T]['Name']) -Color Yellow, DarkGray, Yellow
-            $Script:Reporting[$T]['Data'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Execute'] -WarningVariable CommandWarnings -ErrorVariable CommandErrors -ArgumentList $Forest, $ExcludeDomains, $IncludeDomains
+            $OutputCommand = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Execute'] -WarningVariable CommandWarnings -ErrorVariable CommandErrors -ArgumentList $Forest, $ExcludeDomains, $IncludeDomains
+            if ($OutputCommand -is [System.Collections.IDictionary]) {
+                # in some cases the return will be wrapped in Hashtable/orderedDictionary and we need to handle this without an array
+                $Script:Reporting[$T]['Data'] = $OutputCommand
+            } else {
+                # since sometimes it can be 0 or 1 objects being returned we force it being an array
+                $Script:Reporting[$T]['Data'] = [Array] $OutputCommand
+            }
             Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Processing']
             $Script:Reporting[$T]['WarningsAndErrors'] = @(
                 foreach ($War in $CommandWarnings) {
@@ -86,9 +118,9 @@
                     }
                 }
             )
-            if ($Script:GPOConfiguration[$T]['Summary']) {
-                $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
-            }
+            #if ($Script:GPOConfiguration[$T]['Summary']) {
+            #    $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+            #}
             $TimeEndGPOList = Stop-TimeLog -Time $TimeLogGPOList -Option OneLiner
             $Script:Reporting[$T]['Time'] = $TimeEndGPOList
             Write-Color -Text '[i]', '[End  ] ', $($Script:GPOConfiguration[$T]['Name']), " [Time to execute: $TimeEndGPOList]" -Color Yellow, DarkGray, Yellow, DarkGray
@@ -118,12 +150,18 @@
         if ($Type.Count -eq 1) {
             foreach ($T in $Script:GPOConfiguration.Keys) {
                 if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
+                    if ($Script:GPOConfiguration[$T]['Summary']) {
+                        $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+                    }
                     & $Script:GPOConfiguration[$T]['Solution']
                 }
             }
         } else {
             foreach ($T in $Script:GPOConfiguration.Keys) {
                 if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
+                    if ($Script:GPOConfiguration[$T]['Summary']) {
+                        $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+                    }
                     New-HTMLTab -Name $Script:GPOConfiguration[$T]['Name'] {
                         & $Script:GPOConfiguration[$T]['Solution']
                     }

Public/Invoke-GPOZaurrSupport.ps1

@@ -117,7 +117,8 @@
         $PolicyContent.Rsop
     } else {
         $Output = [ordered] @{
-            ResultantSetPolicy = $ResultantSetPolicy
+            ComputerInformation = Get-Computer -ComputerName $ComputerName
+            ResultantSetPolicy  = $ResultantSetPolicy
         }
         if ($PolicyContent.Rsop.ComputerResults) {
             $Output.ComputerResults = ConvertFrom-XMLRSOP -Content $PolicyContent.Rsop -ResultantSetPolicy $ResultantSetPolicy -ResultsType 'ComputerResults' -Splitter $Splitter

Public/Remove-GPOZaurr.ps1

@@ -1,7 +1,7 @@
 function Remove-GPOZaurr {
     [cmdletBinding(SupportsShouldProcess)]
     param(
-        [parameter(Mandatory)][validateset('Empty', 'Unlinked')][string[]] $Type,
+        [parameter(Mandatory)][validateset('Empty', 'Unlinked', 'Disabled')][string[]] $Type,
         [int] $LimitProcessing,
         [alias('ForestName')][string] $Forest,
         [string[]] $ExcludeDomains,
@@ -28,59 +28,46 @@
     }
     Process {
         Get-GPOZaurr -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation -GPOPath $GPOPath | ForEach-Object {
+            $DeleteRequired = $false
             if ($Type -contains 'Empty') {
-                if ($_.ComputerSettingsAvailable -eq $false -and $_.UserSettingsAvailable -eq $false) {
-                    if ($BackupRequired) {
-                        try {
-                            Write-Verbose "Remove-GPOZaurr - Backing up GPO $($_.DisplayName) from $($_.DomainName)"
-                            $BackupInfo = Backup-GPO -Guid $_.Guid -Domain $_.DomainName -Path $BackupFinalPath -ErrorAction Stop #-Server $QueryServer
-                            $BackupInfo
-                            $BackupOK = $true
-                        } catch {
-                            Write-Warning "Remove-GPOZaurr - Backing up GPO $($_.DisplayName) from $($_.DomainName) failed: $($_.Exception.Message)"
-                            $BackupOK = $false
-                        }
-                    }
-                    if (($BackupRequired -and $BackupOK) -or (-not $BackupRequired)) {
-                        try {
-                            Write-Verbose "Remove-GPOZaurr - Removing GPO $($_.DisplayName) from $($_.DomainName)"
-                            Remove-GPO -Domain $_.DomainName -Guid $_.Guid -ErrorAction Stop #-Server $QueryServer
-                        } catch {
-                            Write-Warning "Remove-GPOZaurr - Removing GPO $($_.DisplayName) from $($_.DomainName) failed: $($_.Exception.Message)"
-                        }
-                    }
-                    $Count++
-                    if ($LimitProcessing -eq $Count) {
-                        break
-                    }
+                if ($_.Empty -eq $true) {
+                    $DeleteRequired = $true
                 }
             }
             if ($Type -contains 'Unlinked') {
                 if ($_.Linked -eq $false) {
-                    if ($BackupRequired) {
-                        try {
-                            Write-Verbose "Remove-GPOZaurr - Backing up GPO $($_.DisplayName) from $($_.DomainName)"
-                            $BackupInfo = Backup-GPO -Guid $_.Guid -Domain $_.DomainName -Path $BackupFinalPath -ErrorAction Stop #-Server $QueryServer
-                            $BackupInfo
-                            $BackupOK = $true
-                        } catch {
-                            Write-Warning "Remove-GPOZaurr - Backing up GPO $($_.DisplayName) from $($_.DomainName) failed: $($_.Exception.Message)"
-                            $BackupOK = $false
-                        }
+                    $DeleteRequired = $true
+                }
+            }
+            if ($Type -contains 'Disabled') {
+                if ($_.Enabled -eq $false) {
+                    $DeleteRequired = $true
+                }
+            }
+            if ($DeleteRequired) {
+                if ($BackupRequired) {
+                    try {
+                        Write-Verbose "Remove-GPOZaurr - Backing up GPO $($_.DisplayName) from $($_.DomainName)"
+                        $BackupInfo = Backup-GPO -Guid $_.Guid -Domain $_.DomainName -Path $BackupFinalPath -ErrorAction Stop #-Server $QueryServer
+                        $BackupInfo
+                        $BackupOK = $true
+                    } catch {
+                        Write-Warning "Remove-GPOZaurr - Backing up GPO $($_.DisplayName) from $($_.DomainName) failed: $($_.Exception.Message)"
+                        $BackupOK = $false
                     }
-                    if (($BackupRequired -and $BackupOK) -or (-not $BackupRequired)) {
-                        try {
-                            Write-Verbose "Remove-GPOZaurr - Removing GPO $($_.DisplayName) from $($_.DomainName)"
-                            Remove-GPO -Domain $_.DomainName -Guid $_.Guid -ErrorAction Stop #-Server $QueryServer
-                        } catch {
-                            Write-Warning "Remove-GPOZaurr - Removing GPO $($_.DisplayName) from $($_.DomainName) failed: $($_.Exception.Message)"
-                        }
-                    }
-                    $Count++
-                    if ($LimitProcessing -eq $Count) {
-                        break
+                }
+                if (($BackupRequired -and $BackupOK) -or (-not $BackupRequired)) {
+                    try {
+                        Write-Verbose "Remove-GPOZaurr - Removing GPO $($_.DisplayName) from $($_.DomainName)"
+                        Remove-GPO -Domain $_.DomainName -Guid $_.Guid -ErrorAction Stop #-Server $QueryServer
+                    } catch {
+                        Write-Warning "Remove-GPOZaurr - Removing GPO $($_.DisplayName) from $($_.DomainName) failed: $($_.Exception.Message)"
                     }
                 }
+                $Count++
+                if ($LimitProcessing -eq $Count) {
+                    break
+                }
             }
         }
     }

Public/Remove-GPOZaurrBroken.ps1

@@ -35,7 +35,7 @@
     } | Select-Object | Select-Object -First $LimitProcessing | ForEach-Object {
         $GPO = $_
         if ($GPO.Status -eq 'Not available in AD') {
-            Write-Verbose "Remove-GPOZaurrBroken - Processing $($GPO.Path)"
+            Write-Verbose "Remove-GPOZaurrBroken - Processing [AD] $($GPO.Path)"
             if ($BackupFinalPath) {
                 Try {
                     Write-Verbose "Remove-GPOZaurrBroken - Backing up $($GPO.Path)"
@@ -55,6 +55,7 @@
                 }
             }
         } elseif ($GPO.Status -eq 'Not available on SYSVOL') {
+            Write-Verbose "Remove-GPOZaurrBroken - Processing [SYSVOL] $($GPO.DistinguishedName)"
             try {
                 $ExistingObject = Get-ADObject -Identity $GPO.DistinguishedName -Server $GPO.DomainName -ErrorAction Stop
             } catch {

Public/Remove-GPOZaurrDuplicateObject.ps1

@@ -7,7 +7,6 @@
         [alias('Domain', 'Domains')][string[]] $IncludeDomains,
         [System.Collections.IDictionary] $ExtendedForestInformation
     )
-
     $getGPOZaurrDuplicateObjectSplat = @{
         Forest                    = $Forest
         IncludeDomains            = $IncludeDomains
@@ -18,7 +17,7 @@
     $DuplicateGpoObjects = Get-GPOZaurrDuplicateObject @getGPOZaurrDuplicateObjectSplat
     foreach ($Duplicate in $DuplicateGpoObjects | Select-Object -First $LimitProcessing) {
         try {
-            Remove-ADObject -Identity $Duplicate.ObjectGUID -Recursive -ErrorAction Stop -Server $Duplicate.DomainName
+            Remove-ADObject -Identity $Duplicate.ObjectGUID -Recursive -ErrorAction Stop -Server $Duplicate.DomainName -Confirm:$false
         } catch {
             Write-Warning "Remove-GPOZaurrDuplicateObject - Deleting $($Duplicate.ConflictDN) / $($Duplicate.DomainName) via GUID: $($Duplicate.ObjectGUID) failed with error: $($_.Exception.Message)"
         }

Public/Repair-GPOZaurrNetLogonOwner.ps1

@@ -17,18 +17,18 @@
     $Principal = $Identity.Name
 
     $getGPOZaurrNetLogonSplat = @{
-        OwnerOnly = $true
-        Forest = $Forest
-        IncludeDomains = $IncludeDomains
-        ExcludeDomains = $ExcludeDomains
+        OwnerOnly                 = $true
+        Forest                    = $Forest
+        IncludeDomains            = $IncludeDomains
+        ExcludeDomains            = $ExcludeDomains
         ExtendedForestInformation = $ExtendedForestInformation
     }
 
-    Get-GPOZaurrNetLogon @getGPOZaurrNetLogonSplat | Select-Object -First $LimitProcessing | Where-Object {
+    Get-GPOZaurrNetLogon @getGPOZaurrNetLogonSplat -Verbose | Where-Object {
         if ($_.OwnerSid -ne 'S-1-5-32-544') {
             $_
         }
-    } | ForEach-Object {
+    } | Select-Object -First $LimitProcessing | ForEach-Object {
         if ($PSCmdlet.ShouldProcess($_.FullName, "Setting NetLogon Owner to $($Principal)")) {
             Set-FileOwner -JustPath -Path $_.FullName -Owner $Principal -Verbose:$true -WhatIf:$WhatIfPreference
         }

Public/Skip-GroupPolicy.ps1

@@ -0,0 +1,14 @@
+function Skip-GroupPolicy {
+    [cmdletBinding()]
+    param(
+        [ValidateSet('GPOList')][string] $Type,
+        [string] $Name,
+        [string] $DomaiName
+    )
+    @{
+        Type       = 'Exclusion'
+        ReportType = $Type
+        Name       = $Name
+        DomainName = $DomaiName
+    }
+}

README.md

@@ -57,6 +57,39 @@ That's it. Whenever there's a new version, you run the command, and you can enjo
 
 ## Changelog
 
+- 0.0.93 - 03.12.2020
+  - [x] Improved `Invoke-GPOZaurr`
+    - [x] Type `GPOList` reverted charts colors for entries to match colors
+    - [ ] Added `Skip-GroupPolicy` to use within `Invoke-GPOZaurr`
+  - [x] Improved `Invoke-GPOZaurr` with basic support for Exclusions
+  - [x] Improved `Get-GPOZaurr` with basic support for Exclusions
+- 0.0.92 - 01.12.2020
+  - [x] Improved `Invoke-GPOZaurrSupport`
+  - [x] Improved `Invoke-GPOZaurr`
+    - [x] Type `GPOList` improved with more data, more problems and clearer information
+  - [x] Improved `Remove-GPOZaurr`
+    - [x] Added ability do remove disabed GPO
+  - [x] Improved `Get-GPOZaurr` detecting more issues, delivering more data
+- 0.0.91 - 24.11.2020
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Improve Type `GPOPermissionsUnknown`
+- 0.0.90 - 23.11.2020
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Improves Type `GPODuplicates`
+      - [x] Fix for chart color to be RED
+    - [x] Add Type `GPOPermissionsUnknown`
+    - [x] Improves logic for Data with 0/1 element
+  - [x] Improves `Remove-GPOZaurrDuplicateObject` - removed `Confirm` requirement
+  - [x] Improves `Get-GPOZaurrNetLogon` with more verbose
+  - [x] Improves `Repair-GPOZaurrNetLogonOwner` with more verbose and fix for `LimitProcessing`
+- 0.0.89 - 22.11.2020
+  - [x] Small update `Add-GPOZaurrPermission`
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Added Type `GPOPermissionsAdministrative`
+- 0.0.88 - 18.11.2020
+  - [x] Fix for `Add-GPOZaurrPermission`
+- 0.0.87 - 18.11.2020
+  - [x] Improve error handling `Remove-GPOZaurrBroken`
 - 0.0.86 - 18.11.2020
   - [x] Improve error handling `Remove-GPOZaurrBroken`
 - 0.0.85 - 17.11.2020