PSD1 update

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.91'
+    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-XMLGPO.ps1

@@ -27,30 +27,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 +63,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 +77,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 +89,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 +100,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 +131,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 +153,10 @@
             } else {
                 $OwnerType = 'NotAdministrative'
             }
-        } else {
+        } elseif ($ADAdministrativeGroups) {
             $OwnerType = 'Unknown'
+        } else {
+            $OwnerType = 'Unable to asses (local files?)'
         }
     }
     if ($PermissionsOnly) {
@@ -189,32 +207,35 @@
             '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
+            '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

@@ -76,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 {
@@ -100,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,15 +130,31 @@
         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 "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. Please review them and make sure this configuration is as expected!" -FontSize 10pt
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Group Policies with problems: ', $Script:Reporting['GPOList']['Variables']['GPOWithProblems'] -FontWeight normal, bold {
@@ -162,11 +179,7 @@
                 }
             }
         } -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
+        #>
     }
     Solution   = {
         New-HTMLSection -Invisible {
@@ -178,41 +191,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 +265,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 +290,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 +376,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

@@ -169,9 +169,9 @@
                             }
                             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."
+                                "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."
+                                "In case of any issues please review and action accordingly. "
                             }
                         }
                         New-HTMLWizardStep -Name 'Verification report' {

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

@@ -149,9 +149,9 @@
                             }
                             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."
+                                "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."
+                                "In case of any issues please review and action accordingly. "
                             }
                         }
                         New-HTMLWizardStep -Name 'Verification report' {

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

Public/Invoke-GPOZaurr.ps1

@@ -93,9 +93,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
@@ -125,12 +125,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
+                }
             }
         }
     }

README.md

@@ -57,6 +57,16 @@ That's it. Whenever there's a new version, you run the command, and you can enjo
 
 ## Changelog
 
+- 0.0.93 - 02.12.2020
+  - [x] Improved `Invoke-GPOZaurr`
+    - [x] Type `GPOList` reverted charts colors for entries to match colors
+- 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`